@@ -42,7 +42,7 @@ mod tests {
42
42
use super :: Executor ;
43
43
use substrate_executor:: WasmExecutor ;
44
44
use codec:: { Slicable , Joiner } ;
45
- use keyring:: Keyring :: { self , Alice , Bob } ;
45
+ use keyring:: Keyring ;
46
46
use runtime_support:: { Hashable , StorageValue , StorageMap } ;
47
47
use state_machine:: { CodeExecutor , TestExternalities } ;
48
48
use primitives:: twox_128;
@@ -63,13 +63,21 @@ mod tests {
63
63
)
64
64
}
65
65
66
+ fn alice ( ) -> Hash {
67
+ Keyring :: Alice . to_raw_public ( ) . into ( )
68
+ }
69
+
70
+ fn bob ( ) -> Hash {
71
+ Keyring :: Bob . to_raw_public ( ) . into ( )
72
+ }
73
+
66
74
fn xt ( ) -> UncheckedExtrinsic {
67
75
let extrinsic = Extrinsic {
68
- signed : Alice . into ( ) ,
76
+ signed : alice ( ) ,
69
77
index : 0 ,
70
- function : Call :: Staking ( staking:: Call :: transfer :: < Concrete > ( Bob . into ( ) , 69 ) ) ,
78
+ function : Call :: Staking ( staking:: Call :: transfer :: < Concrete > ( bob ( ) , 69 ) ) ,
71
79
} ;
72
- let signature = Keyring :: from_raw_public ( extrinsic. signed ) . unwrap ( )
80
+ let signature = Keyring :: from_raw_public ( extrinsic. signed . 0 ) . unwrap ( )
73
81
. sign ( & extrinsic. encode ( ) ) . into ( ) ;
74
82
75
83
UncheckedExtrinsic { extrinsic, signature }
@@ -82,7 +90,7 @@ mod tests {
82
90
#[ test]
83
91
fn panic_execution_with_foreign_code_gives_error ( ) {
84
92
let mut t: TestExternalities = map ! [
85
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
93
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
86
94
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 70u8 ; 8 ] ,
87
95
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
88
96
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -97,7 +105,7 @@ mod tests {
97
105
#[ test]
98
106
fn panic_execution_with_native_equivalent_code_gives_error ( ) {
99
107
let mut t: TestExternalities = map ! [
100
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
108
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
101
109
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 70u8 ; 8 ] ,
102
110
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
103
111
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -112,7 +120,7 @@ mod tests {
112
120
#[ test]
113
121
fn successful_execution_with_native_equivalent_code_gives_ok ( ) {
114
122
let mut t: TestExternalities = map ! [
115
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
123
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
116
124
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
117
125
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
118
126
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -124,15 +132,15 @@ mod tests {
124
132
assert ! ( r. is_ok( ) ) ;
125
133
126
134
runtime_io:: with_externalities ( & mut t, || {
127
- assert_eq ! ( Staking :: balance( & Alice ) , 42 ) ;
128
- assert_eq ! ( Staking :: balance( & Bob ) , 69 ) ;
135
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 42 ) ;
136
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 69 ) ;
129
137
} ) ;
130
138
}
131
139
132
140
#[ test]
133
141
fn successful_execution_with_foreign_code_gives_ok ( ) {
134
142
let mut t: TestExternalities = map ! [
135
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
143
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
136
144
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
137
145
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
138
146
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -144,26 +152,26 @@ mod tests {
144
152
assert ! ( r. is_ok( ) ) ;
145
153
146
154
runtime_io:: with_externalities ( & mut t, || {
147
- assert_eq ! ( Staking :: balance( & Alice ) , 42 ) ;
148
- assert_eq ! ( Staking :: balance( & Bob ) , 69 ) ;
155
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 42 ) ;
156
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 69 ) ;
149
157
} ) ;
150
158
}
151
159
152
160
fn new_test_ext ( ) -> TestExternalities {
153
161
use keyring:: Keyring :: * ;
154
- let three = [ 3u8 ; 32 ] ;
162
+ let three = [ 3u8 ; 32 ] . into ( ) ;
155
163
GenesisConfig {
156
164
consensus : Some ( Default :: default ( ) ) ,
157
165
system : Some ( Default :: default ( ) ) ,
158
166
session : Some ( SessionConfig {
159
167
session_length : 2 ,
160
- validators : vec ! [ One . into( ) , Two . into( ) , three] ,
168
+ validators : vec ! [ One . to_raw_public ( ) . into( ) , Two . to_raw_public ( ) . into( ) , three] ,
161
169
} ) ,
162
170
staking : Some ( StakingConfig {
163
171
sessions_per_era : 2 ,
164
172
current_era : 0 ,
165
- balances : vec ! [ ( Alice . into ( ) , 111 ) ] ,
166
- intentions : vec ! [ Alice . into ( ) , Bob . into ( ) , Charlie . into( ) ] ,
173
+ balances : vec ! [ ( alice ( ) , 111 ) ] ,
174
+ intentions : vec ! [ alice ( ) , bob ( ) , Charlie . to_raw_public ( ) . into( ) ] ,
167
175
validator_count : 3 ,
168
176
bonding_duration : 0 ,
169
177
transaction_base_fee : 1 ,
@@ -178,7 +186,7 @@ mod tests {
178
186
use triehash:: ordered_trie_root;
179
187
180
188
let extrinsics = extrinsics. into_iter ( ) . map ( |extrinsic| {
181
- let signature = Pair :: from ( Keyring :: from_public ( Public :: from_raw ( extrinsic. signed ) ) . unwrap ( ) )
189
+ let signature = Pair :: from ( Keyring :: from_public ( Public :: from_raw ( extrinsic. signed . 0 ) ) . unwrap ( ) )
182
190
. sign ( & extrinsic. encode ( ) ) . into ( ) ;
183
191
184
192
UncheckedExtrinsic { extrinsic, signature }
@@ -204,9 +212,9 @@ mod tests {
204
212
[ 69u8 ; 32 ] . into ( ) ,
205
213
hex ! ( "76b0393b4958d3cb98bb51d9f4edb316af48485142b8721e94c3b52c75ec3243" ) . into ( ) ,
206
214
vec ! [ Extrinsic {
207
- signed: Alice . into ( ) ,
215
+ signed: alice ( ) ,
208
216
index: 0 ,
209
- function: Call :: Staking ( staking:: Call :: transfer( Bob . into ( ) , 69 ) ) ,
217
+ function: Call :: Staking ( staking:: Call :: transfer( bob ( ) , 69 ) ) ,
210
218
} ]
211
219
)
212
220
}
@@ -218,14 +226,14 @@ mod tests {
218
226
hex ! ( "8ae9828a5988459d35fb428086170dead660176ee0766e89bc1a4b48153d4e88" ) . into ( ) ,
219
227
vec ! [
220
228
Extrinsic {
221
- signed: Bob . into ( ) ,
229
+ signed: bob ( ) ,
222
230
index: 0 ,
223
- function: Call :: Staking ( staking:: Call :: transfer( Alice . into ( ) , 5 ) ) ,
231
+ function: Call :: Staking ( staking:: Call :: transfer( alice ( ) , 5 ) ) ,
224
232
} ,
225
233
Extrinsic {
226
- signed: Alice . into ( ) ,
234
+ signed: alice ( ) ,
227
235
index: 1 ,
228
- function: Call :: Staking ( staking:: Call :: transfer( Bob . into ( ) , 15 ) ) ,
236
+ function: Call :: Staking ( staking:: Call :: transfer( bob ( ) , 15 ) ) ,
229
237
}
230
238
]
231
239
)
@@ -238,15 +246,15 @@ mod tests {
238
246
Executor :: new ( ) . call ( & mut t, COMPACT_CODE , "execute_block" , & block1 ( ) . 0 ) . unwrap ( ) ;
239
247
240
248
runtime_io:: with_externalities ( & mut t, || {
241
- assert_eq ! ( Staking :: balance( & Alice ) , 41 ) ;
242
- assert_eq ! ( Staking :: balance( & Bob ) , 69 ) ;
249
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 41 ) ;
250
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 69 ) ;
243
251
} ) ;
244
252
245
253
Executor :: new ( ) . call ( & mut t, COMPACT_CODE , "execute_block" , & block2 ( ) . 0 ) . unwrap ( ) ;
246
254
247
255
runtime_io:: with_externalities ( & mut t, || {
248
- assert_eq ! ( Staking :: balance( & Alice ) , 30 ) ;
249
- assert_eq ! ( Staking :: balance( & Bob ) , 78 ) ;
256
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 30 ) ;
257
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 78 ) ;
250
258
} ) ;
251
259
}
252
260
@@ -257,22 +265,22 @@ mod tests {
257
265
WasmExecutor . call ( & mut t, COMPACT_CODE , "execute_block" , & block1 ( ) . 0 ) . unwrap ( ) ;
258
266
259
267
runtime_io:: with_externalities ( & mut t, || {
260
- assert_eq ! ( Staking :: balance( & Alice ) , 41 ) ;
261
- assert_eq ! ( Staking :: balance( & Bob ) , 69 ) ;
268
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 41 ) ;
269
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 69 ) ;
262
270
} ) ;
263
271
264
272
WasmExecutor . call ( & mut t, COMPACT_CODE , "execute_block" , & block2 ( ) . 0 ) . unwrap ( ) ;
265
273
266
274
runtime_io:: with_externalities ( & mut t, || {
267
- assert_eq ! ( Staking :: balance( & Alice ) , 30 ) ;
268
- assert_eq ! ( Staking :: balance( & Bob ) , 78 ) ;
275
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 30 ) ;
276
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 78 ) ;
269
277
} ) ;
270
278
}
271
279
272
280
#[ test]
273
281
fn panic_execution_gives_error ( ) {
274
282
let mut t: TestExternalities = map ! [
275
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
283
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 69u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
276
284
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 70u8 ; 8 ] ,
277
285
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
278
286
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -288,7 +296,7 @@ mod tests {
288
296
#[ test]
289
297
fn successful_execution_gives_ok ( ) {
290
298
let mut t: TestExternalities = map ! [
291
- twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( * Alice ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
299
+ twox_128( & <staking:: FreeBalance <Concrete >>:: key_for( alice ( ) ) ) . to_vec( ) => vec![ 111u8 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ] ,
292
300
twox_128( <staking:: TransactionBaseFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
293
301
twox_128( <staking:: TransactionByteFee <Concrete >>:: key( ) ) . to_vec( ) => vec![ 0u8 ; 8 ] ,
294
302
twox_128( & <system:: BlockHash <Concrete >>:: key_for( 0 ) ) . to_vec( ) => vec![ 0u8 ; 32 ]
@@ -301,8 +309,8 @@ mod tests {
301
309
assert ! ( r. is_ok( ) ) ;
302
310
303
311
runtime_io:: with_externalities ( & mut t, || {
304
- assert_eq ! ( Staking :: balance( & Alice ) , 42 ) ;
305
- assert_eq ! ( Staking :: balance( & Bob ) , 69 ) ;
312
+ assert_eq ! ( Staking :: balance( & alice ( ) ) , 42 ) ;
313
+ assert_eq ! ( Staking :: balance( & bob ( ) ) , 69 ) ;
306
314
} ) ;
307
315
}
308
316
}
0 commit comments