Skip to content

Commit 0662065

Browse files
mateusz-sekaramateusz-sekara
committed
Fix
1 parent 157f779 commit 0662065

File tree

3 files changed

+100
-82
lines changed

3 files changed

+100
-82
lines changed

‎verifier/token/cctp/config_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func Test_TryParsing(t *testing.T) {
3030
"attestation_api_interval": "200ms",
3131
"attestation_api_cooldown": "10m",
3232
"addresses": map[string]any{
33-
"1": "0xVerifier1",
34-
"2": "0xVerifier2",
33+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
34+
"2": "0x12345678901234567890abcdef12abcdefabcdef",
3535
},
3636
},
3737
want: &CCTPConfig{
@@ -40,8 +40,8 @@ func Test_TryParsing(t *testing.T) {
4040
AttestationAPIInterval: 200 * time.Millisecond,
4141
AttestationAPICooldown: 10 * time.Minute,
4242
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
43-
1: protocol.UnknownAddress("0xVerifier1"),
44-
2: protocol.UnknownAddress("0xVerifier2"),
43+
1: protocol.UnknownAddress("0xabcdef1234567890abcdef1234567890abcdef12"),
44+
2: protocol.UnknownAddress("0x12345678901234567890abcdef12abcdefabcdef"),
4545
},
4646
},
4747
wantErr: false,
@@ -53,7 +53,7 @@ func Test_TryParsing(t *testing.T) {
5353
data: map[string]any{
5454
"attestation_api": "https://iris-api.circle.com",
5555
"addresses": map[string]any{
56-
"1": "0xVerifier1",
56+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
5757
},
5858
},
5959
want: &CCTPConfig{
@@ -62,7 +62,7 @@ func Test_TryParsing(t *testing.T) {
6262
AttestationAPIInterval: 100 * time.Millisecond,
6363
AttestationAPICooldown: 5 * time.Minute,
6464
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
65-
1: protocol.UnknownAddress("0xVerifier1"),
65+
1: protocol.UnknownAddress("0xabcdef1234567890abcdef1234567890abcdef12"),
6666
},
6767
},
6868
wantErr: false,
@@ -95,7 +95,7 @@ func Test_TryParsing(t *testing.T) {
9595
v: "2.0",
9696
data: map[string]any{
9797
"addresses": map[string]any{
98-
"1": "0xVerifier1",
98+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
9999
},
100100
},
101101
want: nil,

‎verifier/token/config_test.go‎

Lines changed: 84 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func Test_Config_Deserialization(t *testing.T) {
3333
attestation_api = "https://iris-api.circle.com"
3434
3535
[token_verifiers.addresses]
36-
"1" = "0xCCTPVerifier1"
37-
2 = "0xCCTPVerifier2"
36+
"1" = "0xabcdef1234567890abcdef1234567890abcdef12"
37+
2 = "0x12345678901234567890abcdef12abcdefabcdef"
3838
3939
[[token_verifiers]]
4040
type = "lbtc"
@@ -44,8 +44,8 @@ func Test_Config_Deserialization(t *testing.T) {
4444
attestation_api_interval = 20
4545
4646
[token_verifiers.addresses]
47-
1 = "0xLBTCVerifier1"
48-
2 = "0xLBTCVerifier2"
47+
1 = "0xabcdef1234567890abcdef1234567890abcdef12"
48+
2 = "0x12345678901234567890abcdef12abcdefabcdef"
4949
`
5050

5151
assertContent := func(config Config) {
@@ -62,17 +62,21 @@ func Test_Config_Deserialization(t *testing.T) {
6262
assert.Equal(t, "2.0", cctpVerifier.Version)
6363
assert.Equal(t, 11*time.Millisecond, cctpVerifier.CCTPConfig.AttestationAPITimeout)
6464
assert.Equal(t, "https://iris-api.circle.com", cctpVerifier.CCTPConfig.AttestationAPI)
65-
assert.Equal(t, protocol.UnknownAddress("0xCCTPVerifier1"), cctpVerifier.CCTPConfig.ParsedVerifiers[1])
66-
assert.Equal(t, protocol.UnknownAddress("0xCCTPVerifier2"), cctpVerifier.CCTPConfig.ParsedVerifiers[2])
65+
expectedAddr1, _ := protocol.NewUnknownAddressFromHex("0xabcdef1234567890abcdef1234567890abcdef12")
66+
assert.Equal(t, expectedAddr1, cctpVerifier.CCTPConfig.ParsedVerifiers[1])
67+
expectedAddr2, _ := protocol.NewUnknownAddressFromHex("0x12345678901234567890abcdef12abcdefabcdef")
68+
assert.Equal(t, expectedAddr2, cctpVerifier.CCTPConfig.ParsedVerifiers[2])
6769

6870
lbtcVerifier := config.TokenVerifiers[1]
6971
assert.Equal(t, "lbtc", lbtcVerifier.Type)
7072
assert.Equal(t, "1.0", lbtcVerifier.Version)
7173
assert.Equal(t, 10*time.Second, lbtcVerifier.LBTCConfig.AttestationAPITimeout)
7274
assert.Equal(t, 100*time.Millisecond, lbtcVerifier.LBTCConfig.AttestationAPIInterval)
7375
assert.Equal(t, "https://lbtc-api.example.com", lbtcVerifier.LBTCConfig.AttestationAPI)
74-
assert.Equal(t, protocol.UnknownAddress("0xLBTCVerifier1"), lbtcVerifier.LBTCConfig.ParsedVerifiers[1])
75-
assert.Equal(t, protocol.UnknownAddress("0xLBTCVerifier2"), lbtcVerifier.LBTCConfig.ParsedVerifiers[2])
76+
expectedAddr3, _ := protocol.NewUnknownAddressFromHex("0xabcdef1234567890abcdef1234567890abcdef12")
77+
assert.Equal(t, expectedAddr3, lbtcVerifier.LBTCConfig.ParsedVerifiers[1])
78+
expectedAddr4, _ := protocol.NewUnknownAddressFromHex("0x12345678901234567890abcdef12abcdefabcdef")
79+
assert.Equal(t, expectedAddr4, lbtcVerifier.LBTCConfig.ParsedVerifiers[2])
7680
}
7781

7882
var config Config
@@ -110,23 +114,27 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
110114
attestation_api_cooldown = "5m"
111115
112116
[addresses]
113-
1 = "0xVerifier1"
114-
2 = "0xVerifier2"
117+
1 = "0xabcdef1234567890abcdef1234567890abcdef12"
118+
2 = "0x12345678901234567890abcdef12abcdefabcdef"
115119
`,
116-
expected: VerifierConfig{
117-
Type: "cctp",
118-
Version: "2.0",
119-
CCTPConfig: &cctp.CCTPConfig{
120-
AttestationAPI: "http://circle.com/attestation",
121-
AttestationAPITimeout: 100 * time.Second,
122-
AttestationAPIInterval: 300 * time.Millisecond,
123-
AttestationAPICooldown: 5 * time.Minute,
124-
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
125-
1: protocol.UnknownAddress("0xVerifier1"),
126-
2: protocol.UnknownAddress("0xVerifier2"),
120+
expected: func() VerifierConfig {
121+
addr1, _ := protocol.NewUnknownAddressFromHex("0xabcdef1234567890abcdef1234567890abcdef12")
122+
addr2, _ := protocol.NewUnknownAddressFromHex("0x12345678901234567890abcdef12abcdefabcdef")
123+
return VerifierConfig{
124+
Type: "cctp",
125+
Version: "2.0",
126+
CCTPConfig: &cctp.CCTPConfig{
127+
AttestationAPI: "http://circle.com/attestation",
128+
AttestationAPITimeout: 100 * time.Second,
129+
AttestationAPIInterval: 300 * time.Millisecond,
130+
AttestationAPICooldown: 5 * time.Minute,
131+
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
132+
1: addr1,
133+
2: addr2,
134+
},
127135
},
128-
},
129-
},
136+
}
137+
}(),
130138
},
131139
{
132140
name: "valid cctp config with missing optional values",
@@ -136,21 +144,24 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
136144
attestation_api = "http://circle.com/attestation"
137145
138146
[addresses]
139-
"1" = "0xVerifier1"
147+
"1" = "0xabcdef1234567890abcdef1234567890abcdef12"
140148
`,
141-
expected: VerifierConfig{
142-
Type: "cctp",
143-
Version: "2.0",
144-
CCTPConfig: &cctp.CCTPConfig{
145-
AttestationAPI: "http://circle.com/attestation",
146-
AttestationAPITimeout: 1 * time.Second,
147-
AttestationAPIInterval: 100 * time.Millisecond,
148-
AttestationAPICooldown: 5 * time.Minute,
149-
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
150-
1: protocol.UnknownAddress("0xVerifier1"),
149+
expected: func() VerifierConfig {
150+
addr1, _ := protocol.NewUnknownAddressFromHex("0xabcdef1234567890abcdef1234567890abcdef12")
151+
return VerifierConfig{
152+
Type: "cctp",
153+
Version: "2.0",
154+
CCTPConfig: &cctp.CCTPConfig{
155+
AttestationAPI: "http://circle.com/attestation",
156+
AttestationAPITimeout: 1 * time.Second,
157+
AttestationAPIInterval: 100 * time.Millisecond,
158+
AttestationAPICooldown: 5 * time.Minute,
159+
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
160+
1: addr1,
161+
},
151162
},
152-
},
153-
},
163+
}
164+
}(),
154165
},
155166
{
156167
name: "malformed cctp config returns error",
@@ -160,7 +171,7 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
160171
attestation_api_timeout = "not-a-duration"
161172
162173
[addresses]
163-
1 = "0xVerifier1"
174+
1 = "0xabcdef1234567890abcdef1234567890abcdef12"
164175
`,
165176
wantErr: true,
166177
},
@@ -175,23 +186,27 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
175186
attestation_api_batch_size = 50
176187
177188
[addresses]
178-
1 = "0xLBTCVerifier1"
179-
2 = "0xLBTCVerifier2"
189+
1 = "0x1234567890123456789012345678901234567890"
190+
2 = "0xabcdefabcdefabcdefabcdefabcdefabcdefabcd"
180191
`,
181-
expected: VerifierConfig{
182-
Type: "lbtc",
183-
Version: "1.0",
184-
LBTCConfig: &lbtc.LBTCConfig{
185-
AttestationAPI: "http://lbtc.com/gohere",
186-
AttestationAPITimeout: 2 * time.Second,
187-
AttestationAPIInterval: 500 * time.Millisecond,
188-
AttestationAPIBatchSize: 50,
189-
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
190-
1: protocol.UnknownAddress("0xLBTCVerifier1"),
191-
2: protocol.UnknownAddress("0xLBTCVerifier2"),
192+
expected: func() VerifierConfig {
193+
addr1, _ := protocol.NewUnknownAddressFromHex("0x1234567890123456789012345678901234567890")
194+
addr2, _ := protocol.NewUnknownAddressFromHex("0xabcdefabcdefabcdefabcdefabcdefabcdefabcd")
195+
return VerifierConfig{
196+
Type: "lbtc",
197+
Version: "1.0",
198+
LBTCConfig: &lbtc.LBTCConfig{
199+
AttestationAPI: "http://lbtc.com/gohere",
200+
AttestationAPITimeout: 2 * time.Second,
201+
AttestationAPIInterval: 500 * time.Millisecond,
202+
AttestationAPIBatchSize: 50,
203+
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
204+
1: addr1,
205+
2: addr2,
206+
},
192207
},
193-
},
194-
},
208+
}
209+
}(),
195210
},
196211
{
197212
name: "valid lbtc config with missing optional values",
@@ -201,21 +216,24 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
201216
attestation_api = "http://lbtc.com/gohere"
202217
203218
[addresses]
204-
1 = "0xLBTCVerifier1"
219+
1 = "0x1234567890123456789012345678901234567890"
205220
`,
206-
expected: VerifierConfig{
207-
Type: "lbtc",
208-
Version: "1.0",
209-
LBTCConfig: &lbtc.LBTCConfig{
210-
AttestationAPI: "http://lbtc.com/gohere",
211-
AttestationAPITimeout: 1 * time.Second,
212-
AttestationAPIInterval: 100 * time.Millisecond,
213-
AttestationAPIBatchSize: 20,
214-
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
215-
1: protocol.UnknownAddress("0xLBTCVerifier1"),
221+
expected: func() VerifierConfig {
222+
addr1, _ := protocol.NewUnknownAddressFromHex("0x1234567890123456789012345678901234567890")
223+
return VerifierConfig{
224+
Type: "lbtc",
225+
Version: "1.0",
226+
LBTCConfig: &lbtc.LBTCConfig{
227+
AttestationAPI: "http://lbtc.com/gohere",
228+
AttestationAPITimeout: 1 * time.Second,
229+
AttestationAPIInterval: 100 * time.Millisecond,
230+
AttestationAPIBatchSize: 20,
231+
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
232+
1: addr1,
233+
},
216234
},
217-
},
218-
},
235+
}
236+
}(),
219237
},
220238
{
221239
name: "malformed lbtc config returns error",
@@ -225,7 +243,7 @@ func Test_VerifierConfig_Deserialization(t *testing.T) {
225243
attestation_api_dur = "10s"
226244
227245
[addresses]
228-
1 = "0xLBTCVerifier1"
246+
1 = "0x1234567890123456789012345678901234567890"
229247
`,
230248
wantErr: true,
231249
},

‎verifier/token/lbtc/config_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func Test_TryParsing(t *testing.T) {
3030
"attestation_api_interval": "200ms",
3131
"attestation_api_batch_size": 50,
3232
"addresses": map[string]any{
33-
"1": "0xVerifier1",
34-
"2": "0xVerifier2",
33+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
34+
"2": "0x12345678901234567890abcdef12abcdefabcdef",
3535
},
3636
},
3737
want: &LBTCConfig{
@@ -40,8 +40,8 @@ func Test_TryParsing(t *testing.T) {
4040
AttestationAPIInterval: 200 * time.Millisecond,
4141
AttestationAPIBatchSize: 50,
4242
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
43-
1: protocol.UnknownAddress("0xVerifier1"),
44-
2: protocol.UnknownAddress("0xVerifier2"),
43+
1: protocol.UnknownAddress("0xabcdef1234567890abcdef1234567890abcdef12"),
44+
2: protocol.UnknownAddress("0x12345678901234567890abcdef12abcdefabcdef"),
4545
},
4646
},
4747
wantErr: false,
@@ -53,7 +53,7 @@ func Test_TryParsing(t *testing.T) {
5353
data: map[string]any{
5454
"attestation_api": "https://lbtc-api.example.com",
5555
"addresses": map[string]any{
56-
"1": "0xVerifier1",
56+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
5757
},
5858
},
5959
want: &LBTCConfig{
@@ -62,7 +62,7 @@ func Test_TryParsing(t *testing.T) {
6262
AttestationAPIInterval: 100 * time.Millisecond,
6363
AttestationAPIBatchSize: 20,
6464
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
65-
1: protocol.UnknownAddress("0xVerifier1"),
65+
1: protocol.UnknownAddress("0xabcdef1234567890abcdef1234567890abcdef12"),
6666
},
6767
},
6868
wantErr: false,
@@ -75,7 +75,7 @@ func Test_TryParsing(t *testing.T) {
7575
"attestation_api": "https://lbtc-api.example.com",
7676
"attestation_api_batch_size": "30",
7777
"addresses": map[string]any{
78-
"1": "0xVerifier1",
78+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
7979
},
8080
},
8181
want: &LBTCConfig{
@@ -84,7 +84,7 @@ func Test_TryParsing(t *testing.T) {
8484
AttestationAPIInterval: 100 * time.Millisecond,
8585
AttestationAPIBatchSize: 30,
8686
ParsedVerifiers: map[protocol.ChainSelector]protocol.UnknownAddress{
87-
1: protocol.UnknownAddress("0xVerifier1"),
87+
1: protocol.UnknownAddress("0xabcdef1234567890abcdef1234567890abcdef12"),
8888
},
8989
},
9090
wantErr: false,
@@ -117,7 +117,7 @@ func Test_TryParsing(t *testing.T) {
117117
v: "1.0",
118118
data: map[string]any{
119119
"addresses": map[string]any{
120-
"1": "0xVerifier1",
120+
"1": "0xabcdef1234567890abcdef1234567890abcdef12",
121121
},
122122
},
123123
want: nil,

0 commit comments

Comments
 (0)