Skip to content

Commit f799c86

Browse files
WRRicht3rWRRicht3r
committed
test(fixes): add 'elected' argument to ElectedValidatorInfo in tests; fix AccountData in WestendStub; add missing SSFModels imports
Signed-off-by: William Richter <[email protected]>
1 parent faf6b0d commit f799c86

File tree

3 files changed

+46
-24
lines changed

3 files changed

+46
-24
lines changed

‎fearlessTests/Helper/WestendStub.swift‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ struct WestendStub {
3333

3434
static let accountInfo: DecodedAccountInfo = {
3535

36-
let data = AccountData(free: BigUInt(1e+13),
37-
reserved: BigUInt(0),
38-
miscFrozen: BigUInt(0),
39-
feeFrozen: BigUInt(0))
36+
let data = AccountData(
37+
free: BigUInt(1e+13),
38+
reserved: BigUInt(0),
39+
frozen: BigUInt(0),
40+
flags: BigUInt(0)
41+
)
4042

4143
let info = AccountInfo(nonce: 1,
4244
consumers: 0,
@@ -106,7 +108,8 @@ struct WestendStub {
106108
stakeReturn: 0.1,
107109
hasSlashes: false,
108110
maxNominatorsRewarded: 128,
109-
blocked: false)
111+
blocked: false,
112+
elected: true)
110113
return [validator]
111114
}()
112115

@@ -121,7 +124,8 @@ struct WestendStub {
121124
stakeReturn: 0.1,
122125
hasSlashes: true,
123126
maxNominatorsRewarded: 1000,
124-
blocked: false)
127+
blocked: false,
128+
elected: false)
125129
return [validator]
126130
}()
127131

‎fearlessTests/Modules/Staking/SelectValidatorsFlow/CustomValidators/CustomValidatorListTestDataGenerator.swift‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ struct CustomValidatorListTestDataGenerator {
1313
stakeReturn: 0.1,
1414
hasSlashes: false,
1515
maxNominatorsRewarded: 128,
16-
blocked: false
16+
blocked: false,
17+
elected: true
1718
)
1819
}()
1920

@@ -28,7 +29,8 @@ struct CustomValidatorListTestDataGenerator {
2829
stakeReturn: 0.1,
2930
hasSlashes: true,
3031
maxNominatorsRewarded: 128,
31-
blocked: false
32+
blocked: false,
33+
elected: true
3234
)
3335
}()
3436

@@ -46,7 +48,8 @@ struct CustomValidatorListTestDataGenerator {
4648
stakeReturn: 0.1,
4749
hasSlashes: false,
4850
maxNominatorsRewarded: 1,
49-
blocked: false
51+
blocked: false,
52+
elected: true
5053
)
5154
}()
5255

@@ -61,7 +64,8 @@ struct CustomValidatorListTestDataGenerator {
6164
stakeReturn: 0.2,
6265
hasSlashes: false,
6366
maxNominatorsRewarded: 128,
64-
blocked: false
67+
blocked: false,
68+
elected: true
6569
)
6670
}()
6771

@@ -81,7 +85,8 @@ struct CustomValidatorListTestDataGenerator {
8185
stakeReturn: 0.5,
8286
hasSlashes: false,
8387
maxNominatorsRewarded: 128,
84-
blocked: false
88+
blocked: false,
89+
elected: true
8590
)
8691
}()
8792

@@ -101,7 +106,8 @@ struct CustomValidatorListTestDataGenerator {
101106
stakeReturn: 0.54,
102107
hasSlashes: false,
103108
maxNominatorsRewarded: 128,
104-
blocked: false
109+
blocked: false,
110+
elected: true
105111
)
106112
}()
107113

@@ -116,7 +122,8 @@ struct CustomValidatorListTestDataGenerator {
116122
stakeReturn: 0.2,
117123
hasSlashes: false,
118124
maxNominatorsRewarded: 128,
119-
blocked: false
125+
blocked: false,
126+
elected: true
120127
)
121128
}()
122129

@@ -131,7 +138,8 @@ struct CustomValidatorListTestDataGenerator {
131138
stakeReturn: 0.1,
132139
hasSlashes: false,
133140
maxNominatorsRewarded: 128,
134-
blocked: false
141+
blocked: false,
142+
elected: true
135143
)
136144
}()
137145

@@ -146,7 +154,8 @@ struct CustomValidatorListTestDataGenerator {
146154
stakeReturn: 0.01,
147155
hasSlashes: false,
148156
maxNominatorsRewarded: 128,
149-
blocked: false
157+
blocked: false,
158+
elected: true
150159
)
151160
}()
152161

‎fearlessTests/Modules/Staking/SelectValidatorsFlow/RecommendedValidators/RecommendationsComposerTests.swift‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ class RecommendationsComposerTests: XCTestCase {
1313
stakeReturn: 0.9,
1414
hasSlashes: false,
1515
maxNominatorsRewarded: 128,
16-
blocked: false
16+
blocked: false,
17+
elected: true
1718
),
1819

1920
ElectedValidatorInfo(
@@ -31,7 +32,8 @@ class RecommendationsComposerTests: XCTestCase {
3132
stakeReturn: 0.5,
3233
hasSlashes: false,
3334
maxNominatorsRewarded: 128,
34-
blocked: false
35+
blocked: false,
36+
elected: true
3537
),
3638
ElectedValidatorInfo(
3739
address: "5EJQtTE1ZS9cBdqiuUdjQtieNLRVjk7Pyo6Bfv8Ff6e7pnr9",
@@ -43,7 +45,8 @@ class RecommendationsComposerTests: XCTestCase {
4345
stakeReturn: 0.1,
4446
hasSlashes: false,
4547
maxNominatorsRewarded: 128,
46-
blocked: false
48+
blocked: false,
49+
elected: true
4750
),
4851
ElectedValidatorInfo(
4952
address: "5EJQtTE1ZS9cBdqiuUdjQtieNLRVjk7Pyo6Bfv8Ff6e7pnr7",
@@ -55,7 +58,8 @@ class RecommendationsComposerTests: XCTestCase {
5558
stakeReturn: 0.6,
5659
hasSlashes: false,
5760
maxNominatorsRewarded: 128,
58-
blocked: false
61+
blocked: false,
62+
elected: true
5963
),
6064

6165
ElectedValidatorInfo(
@@ -68,7 +72,8 @@ class RecommendationsComposerTests: XCTestCase {
6872
stakeReturn: 0.9,
6973
hasSlashes: true,
7074
maxNominatorsRewarded: 128,
71-
blocked: false
75+
blocked: false,
76+
elected: false
7277
),
7378

7479
ElectedValidatorInfo(
@@ -81,7 +86,8 @@ class RecommendationsComposerTests: XCTestCase {
8186
stakeReturn: 0.9,
8287
hasSlashes: false,
8388
maxNominatorsRewarded: 128,
84-
blocked: true
89+
blocked: true,
90+
elected: true
8591
)
8692
]
8793

@@ -99,7 +105,8 @@ class RecommendationsComposerTests: XCTestCase {
99105
stakeReturn: 0.6,
100106
hasSlashes: false,
101107
maxNominatorsRewarded: 128,
102-
blocked: false
108+
blocked: false,
109+
elected: true
103110
),
104111
ElectedValidatorInfo(
105112
address: "5EJQtTE1ZS9cBdqiuUdjQtieNLRVjk7Pyo6Bfv8Ff6e7pnr9",
@@ -111,7 +118,8 @@ class RecommendationsComposerTests: XCTestCase {
111118
stakeReturn: 0.1,
112119
hasSlashes: false,
113120
maxNominatorsRewarded: 128,
114-
blocked: false
121+
blocked: false,
122+
elected: true
115123
)
116124
]
117125

@@ -140,7 +148,8 @@ class RecommendationsComposerTests: XCTestCase {
140148
stakeReturn: 0.6,
141149
hasSlashes: false,
142150
maxNominatorsRewarded: 128,
143-
blocked: false
151+
blocked: false,
152+
elected: true
144153
)
145154
]
146155

0 commit comments

Comments
 (0)