Skip to content

Commit b97729d

Browse files
authored
Fixing semver version check in e2e (#2307)
1 parent 036c09e commit b97729d

File tree

3 files changed

+80
-2
lines changed

3 files changed

+80
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
[
2+
{
3+
"test-entry-point": "TestInterchainAccountsTestSuite",
4+
"chain-binary": "icad",
5+
"tests": [
6+
{
7+
"chain-a-tag": "v0.3.3",
8+
"chain-b-tag": "v0.1.4"
9+
},
10+
{
11+
"chain-a-tag": "v0.1.4",
12+
"chain-b-tag": "v0.3.3"
13+
},
14+
{
15+
"chain-a-tag": "v0.2.3",
16+
"chain-b-tag": "v0.3.3"
17+
},
18+
{
19+
"chain-a-tag": "v0.3.3",
20+
"chain-b-tag": "v0.2.3"
21+
},
22+
{
23+
"chain-a-tag": "v0.3.3",
24+
"chain-b-tag": "v0.3.3"
25+
},
26+
{
27+
"chain-a-tag": "v0.2.3",
28+
"chain-b-tag": "v0.2.3"
29+
},
30+
{
31+
"chain-a-tag": "v0.1.4",
32+
"chain-b-tag": "v0.1.4"
33+
}
34+
]
35+
},
36+
{
37+
"test-entry-point": "TestIncentivizedInterchainAccountsTestSuite",
38+
"chain-binary": "icad",
39+
"tests": [
40+
{
41+
"chain-a-tag": "v0.2.3",
42+
"chain-b-tag": "v0.3.3"
43+
},
44+
{
45+
"chain-a-tag": "v0.3.3",
46+
"chain-b-tag": "v0.2.3"
47+
},
48+
{
49+
"chain-a-tag": "v0.3.3",
50+
"chain-b-tag": "v0.3.3"
51+
},
52+
{
53+
"chain-a-tag": "v0.2.3",
54+
"chain-b-tag": "v0.2.3"
55+
}
56+
]
57+
}
58+
]

e2e/scripts/test-matricies/main/test-matrix.json

+20
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,18 @@
6262
{
6363
"chain-a-tag": "v0.3.3",
6464
"chain-b-tag": "v0.2.3"
65+
},
66+
{
67+
"chain-a-tag": "v0.3.3",
68+
"chain-b-tag": "v0.3.3"
69+
},
70+
{
71+
"chain-a-tag": "v0.2.3",
72+
"chain-b-tag": "v0.2.3"
73+
},
74+
{
75+
"chain-a-tag": "v0.1.4",
76+
"chain-b-tag": "v0.1.4"
6577
}
6678
]
6779
},
@@ -76,6 +88,14 @@
7688
{
7789
"chain-a-tag": "v0.3.3",
7890
"chain-b-tag": "v0.2.3"
91+
},
92+
{
93+
"chain-a-tag": "v0.3.3",
94+
"chain-b-tag": "v0.3.3"
95+
},
96+
{
97+
"chain-a-tag": "v0.2.3",
98+
"chain-b-tag": "v0.2.3"
7999
}
80100
]
81101
}

e2e/tests/interchain_accounts/base_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ func (s *InterchainAccountsTestSuite) RegisterCounterPartyPayee(ctx context.Cont
5050
// getICAVersion returns the version which should be used in the MsgRegisterAccount broadcast from the
5151
// controller chain.
5252
func getICAVersion(chainAVersion, chainBVersion string) string {
53-
chainBIsGreaterThanChainA := semver.Compare(chainAVersion, chainBVersion) == -1
54-
if chainBIsGreaterThanChainA {
53+
chainBIsGreaterThanOrEqualToChainA := semver.Compare(chainAVersion, chainBVersion) <= 0
54+
if chainBIsGreaterThanOrEqualToChainA {
5555
// allow version to be specified by the controller chain
5656
return ""
5757
}

0 commit comments

Comments
 (0)