Skip to content

Commit 270b7dc

Browse files
mulfdevmulfdev
committed
fix schema, add gh workflow
1 parent 4209c3d commit 270b7dc

File tree

9 files changed

+102
-122
lines changed

9 files changed

+102
-122
lines changed

‎.github/workflows/vaildate.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Go Test with Docker
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
branches:
9+
- main
10+
11+
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
container:
15+
image: golang:1.23-alpine
16+
options: --user root
17+
18+
steps:
19+
- name: Checkout code
20+
uses: actions/checkout@v3
21+
22+
- name: Run main.go
23+
run: |
24+
go run main.go
25+
env:
26+
GOOS: linux
27+
GOARCH: amd64
28+
29+
- name: Test
30+
run: go test -v ./...

‎bridging-token-registry

-4.12 MB
Binary file not shown.

‎main.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
type vaildationError struct {
1111
tokenType TokenType
1212
err error
13+
file string
1314
}
1415

1516
type schemaType struct {
@@ -61,8 +62,6 @@ func main() {
6162
continue
6263
}
6364

64-
fmt.Println("got all schemas")
65-
6665
sch, err := comp.Compile(schema.schemaLocation)
6766
if err != nil {
6867
errors = append(errors, vaildationError{
@@ -79,6 +78,7 @@ func main() {
7978
errors = append(errors, vaildationError{
8079
tokenType: token,
8180
err: err,
81+
file: fileLocation,
8282
})
8383
continue
8484
}
@@ -88,25 +88,29 @@ func main() {
8888
errors = append(errors, vaildationError{
8989
tokenType: token,
9090
err: err,
91+
file: fileLocation,
9192
})
9293
continue
9394
}
94-
defer file.Close()
9595

9696
inst, err := jsonschema.UnmarshalJSON(file)
9797
if err != nil {
9898
errors = append(errors, vaildationError{
9999
tokenType: token,
100100
err: err,
101+
file: fileLocation,
101102
})
102103
continue
103104
}
104105

106+
file.Close()
107+
105108
err = schema.compiledSchema.Validate(inst)
106109
if err != nil {
107110
errors = append(errors, vaildationError{
108111
tokenType: token,
109112
err: err,
113+
file: fileLocation,
110114
})
111115
continue
112116
}
@@ -118,7 +122,7 @@ func main() {
118122
if len(errors) > 0 {
119123
fmt.Println("vaildation errors occured")
120124
for _, err := range errors {
121-
fmt.Println(err.err.Error())
125+
fmt.Println(fmt.Sprintf("%s: %s in file %s", err.tokenType, err.err.Error(), err.file))
122126
}
123127

124128
os.Exit(1)

‎mainnet/erc1155-data.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,26 @@
1-
{}
1+
{
2+
"$schema": "https://json-schema.org/draft/2019-09/schema",
3+
"tokens": [
4+
{
5+
"name": "Magic Crystal",
6+
"existingToken": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
7+
"adapterAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
8+
"oftAddress": "0x8fC72388B128B36890057b1b4f4C9746d7157f2E",
9+
"batchTransferEnabled": true
10+
},
11+
{
12+
"name": "Ethereal Blade",
13+
"existingToken": "0x742d35Cc6634C0532925a3b844Bc454e4438f44e",
14+
"adapterAddress": "0x3D9819210A31b4961b30EF54bE2aeD79B9c9Cd3B",
15+
"oftAddress": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
16+
"batchTransferEnabled": false
17+
},
18+
{
19+
"name": "Quantum Shard",
20+
"existingToken": "0xE11BA2b4D45Eaed5996cd0824791E0C93114882d",
21+
"adapterAddress": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
22+
"oftAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
23+
"batchTransferEnabled": true
24+
}
25+
]
26+
}

‎mainnet/erc20-data.json

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,10 @@
11
{
22
"tokens": [
3-
{
4-
"name": "MagicToken",
5-
"existingToken": "0x1234567890abcdef1234567890abcdef12345678",
6-
"adapterAddress": "0x9876543210fedcba9876543210fedcba98765432",
7-
"oftAddress": "0xabcde12345abcde12345abcde12345abcde1234"
8-
},
9-
{
10-
"name": "ElixirCoin",
11-
"existingToken": "0x2345678901abcdef2345678901abcdef23456789",
12-
"adapterAddress": "0x8765432109fedcba8765432109fedcba87654321",
13-
"oftAddress": "0x12345fedcba12345fedcba12345fedcba12345"
14-
},
15-
{
16-
"name": "GlimmerGold",
17-
"existingToken": "0x3456789012abcdef3456789012abcdef34567890",
18-
"adapterAddress": "0x7654321098fedcba7654321098fedcba76543210",
19-
"oftAddress": "0x234560fedcba234560fedcba234560fedcba2345"
20-
},
21-
{
22-
"name": "MysticSilver",
23-
"existingToken": "0x4567890123abcdef4567890123abcdef45678901",
24-
"adapterAddress": "0x6543210987fedcba6543210987fedcba65432109",
25-
"oftAddress": "0x345671fedcba345671fedcba345671fedcba3456"
26-
},
273
{
284
"name": "ArcaneAmber",
29-
"existingToken": "0x5678901234abcdef5678901234abcdef56789012",
30-
"adapterAddress": "0x5432109876fedcba5432109876fedcba54321098",
31-
"oftAddress": "0x456782fedcba456782fedcba456782fedcba4567"
5+
"existingToken": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
6+
"adapterAddress": "0x3D9819210A31b4961b30EF54bE2aeD79B9c9Cd3B",
7+
"oftAddress": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
328
}
339
]
3410
}

‎mainnet/erc721-data.json

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,11 @@
22
"tokens": [
33
{
44
"name": "Magic Sword",
5-
"existingToken": "0x1234567890abcdef1234567890abcdef12345678",
6-
"adapterAddress": "0x9876543210fedcba9876543210fedcba98765432",
7-
"oftAddress": "0x5555aaaa5555ffff5555aaaa5555ffff5555aaaa",
5+
"existingToken": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
6+
"adapterAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
7+
"oftAddress": "0x8fC72388B128B36890057b1b4f4C9746d7157f2E",
88
"batchTransferEnabled": true
9-
},
10-
{
11-
"name": "Golden Shield",
12-
"existingToken": "0xabcdeffedcba09876543210fedcba0987654321",
13-
"adapterAddress": "0x1111222233334444555566667777888899990000",
14-
"oftAddress": "0x0000111122223333444455556666777788889999",
15-
"batchTransferEnabled": false
16-
},
17-
{
18-
"name": "Mystic Orb",
19-
"existingToken": "0x0987654321fedcba9876543210fedcba98765432",
20-
"adapterAddress": "0x44443333222211110000fffeeefdddcbbba999888",
21-
"oftAddress": "0x88889999aaaaeeeec0c0d0d0e0e0f0f000001111",
22-
"batchTransferEnabled": true
23-
},
24-
{
25-
"name": "Eternal Flame",
26-
"existingToken": "0x567890abcdef1234567890abcdef1234567890",
27-
"adapterAddress": "0x777788889999aaaa000011112222333344445555",
28-
"oftAddress": "0x9999888877776666555544443333222211110000",
29-
"batchTransferEnabled": true
30-
},
31-
{
32-
"name": "Crystal Staff",
33-
"existingToken": "0x1111222233334444555566667777888899990000",
34-
"adapterAddress": "0x3210fedcba9876543210fedcba9876543210fedc",
35-
"oftAddress": "0x0000000000000000000000000000000000000000",
36-
"batchTransferEnabled": false
379
}
10+
3811
]
3912
}

‎testnet/erc1155-data.json

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,25 @@
1-
{}
1+
{
2+
"tokens": [
3+
{
4+
"name": "Magic Crystal",
5+
"existingToken": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
6+
"adapterAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
7+
"oftAddress": "0x8fC72388B128B36890057b1b4f4C9746d7157f2E",
8+
"batchTransferEnabled": true
9+
},
10+
{
11+
"name": "Ethereal Blade",
12+
"existingToken": "0x742d35Cc6634C0532925a3b844Bc454e4438f44e",
13+
"adapterAddress": "0x3D9819210A31b4961b30EF54bE2aeD79B9c9Cd3B",
14+
"oftAddress": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
15+
"batchTransferEnabled": false
16+
},
17+
{
18+
"name": "Quantum Shard",
19+
"existingToken": "0xE11BA2b4D45Eaed5996cd0824791E0C93114882d",
20+
"adapterAddress": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
21+
"oftAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
22+
"batchTransferEnabled": true
23+
}
24+
]
25+
}

‎testnet/erc20-data.json

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,10 @@
11
{
22
"tokens": [
3-
{
4-
"name": "MagicToken",
5-
"existingToken": "0x1234567890abcdef1234567890abcdef12345678",
6-
"adapterAddress": "0x9876543210fedcba9876543210fedcba98765432",
7-
"oftAddress": "0xabcde12345abcde12345abcde12345abcde1234"
8-
},
9-
{
10-
"name": "ElixirCoin",
11-
"existingToken": "0x2345678901abcdef2345678901abcdef23456789",
12-
"adapterAddress": "0x8765432109fedcba8765432109fedcba87654321",
13-
"oftAddress": "0x12345fedcba12345fedcba12345fedcba12345"
14-
},
15-
{
16-
"name": "GlimmerGold",
17-
"existingToken": "0x3456789012abcdef3456789012abcdef34567890",
18-
"adapterAddress": "0x7654321098fedcba7654321098fedcba76543210",
19-
"oftAddress": "0x234560fedcba234560fedcba234560fedcba2345"
20-
},
21-
{
22-
"name": "MysticSilver",
23-
"existingToken": "0x4567890123abcdef4567890123abcdef45678901",
24-
"adapterAddress": "0x6543210987fedcba6543210987fedcba65432109",
25-
"oftAddress": "0x345671fedcba345671fedcba345671fedcba3456"
26-
},
273
{
284
"name": "ArcaneAmber",
29-
"existingToken": "0x5678901234abcdef5678901234abcdef56789012",
30-
"adapterAddress": "0x5432109876fedcba5432109876fedcba54321098",
31-
"oftAddress": "0x456782fedcba456782fedcba456782fedcba4567"
5+
"existingToken": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1",
6+
"adapterAddress": "0x3D9819210A31b4961b30EF54bE2aeD79B9c9Cd3B",
7+
"oftAddress": "0x90F8bf6A479f320ead074411a4B0e7944Ea8c9C1"
328
}
339
]
3410
}

‎testnet/erc721-data.json

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,10 @@
22
"tokens": [
33
{
44
"name": "Magic Sword",
5-
"existingToken": "0x1234567890abcdef1234567890abcdef12345678",
6-
"adapterAddress": "0x9876543210fedcba9876543210fedcba98765432",
7-
"oftAddress": "0x5555aaaa5555ffff5555aaaa5555ffff5555aaaa",
5+
"existingToken": "0x1dD8E8BD0e5c7759B006C2f7985233B3887E57e1",
6+
"adapterAddress": "0x5a32119C68032d4F2F8cDB072E89f12550f2B782",
7+
"oftAddress": "0x8fC72388B128B36890057b1b4f4C9746d7157f2E",
88
"batchTransferEnabled": true
9-
},
10-
{
11-
"name": "Golden Shield",
12-
"existingToken": "0xabcdeffedcba09876543210fedcba0987654321",
13-
"adapterAddress": "0x1111222233334444555566667777888899990000",
14-
"oftAddress": "0x0000111122223333444455556666777788889999",
15-
"batchTransferEnabled": false
16-
},
17-
{
18-
"name": "Mystic Orb",
19-
"existingToken": "0x0987654321fedcba9876543210fedcba98765432",
20-
"adapterAddress": "0x44443333222211110000fffeeefdddcbbba999888",
21-
"oftAddress": "0x88889999aaaaeeeec0c0d0d0e0e0f0f000001111",
22-
"batchTransferEnabled": true
23-
},
24-
{
25-
"name": "Eternal Flame",
26-
"existingToken": "0x567890abcdef1234567890abcdef1234567890",
27-
"adapterAddress": "0x777788889999aaaa000011112222333344445555",
28-
"oftAddress": "0x9999888877776666555544443333222211110000",
29-
"batchTransferEnabled": true
30-
},
31-
{
32-
"name": "Crystal Staff",
33-
"existingToken": "0x1111222233334444555566667777888899990000",
34-
"adapterAddress": "0x3210fedcba9876543210fedcba9876543210fedc",
35-
"oftAddress": "0x0000000000000000000000000000000000000000",
36-
"batchTransferEnabled": false
379
}
3810
]
3911
}

0 commit comments

Comments
 (0)