@@ -1015,10 +1015,11 @@ mod tests {
1015
1015
pub const MaxProposals : u32 = 100 ;
1016
1016
}
1017
1017
impl frame_system:: Trait for Test {
1018
+ type BaseCallFilter = ( ) ;
1018
1019
type Origin = Origin ;
1019
1020
type Index = u64 ;
1020
1021
type BlockNumber = u64 ;
1021
- type Call = ( ) ;
1022
+ type Call = Call ;
1022
1023
type Hash = H256 ;
1023
1024
type Hashing = BlakeTwo256 ;
1024
1025
type AccountId = u64 ;
@@ -1167,7 +1168,7 @@ mod tests {
1167
1168
let proposal_len: u32 = proposal. using_encoded ( |p| p. len ( ) as u32 ) ;
1168
1169
let proposal_weight = proposal. get_dispatch_info ( ) . weight ;
1169
1170
let hash = BlakeTwo256 :: hash_of ( & proposal) ;
1170
- assert_ok ! ( Collective :: set_members( Origin :: ROOT , vec![ 1 , 2 , 3 ] , Some ( 3 ) , MAX_MEMBERS ) ) ;
1171
+ assert_ok ! ( Collective :: set_members( Origin :: root ( ) , vec![ 1 , 2 , 3 ] , Some ( 3 ) , MAX_MEMBERS ) ) ;
1171
1172
1172
1173
assert_ok ! ( Collective :: propose( Origin :: signed( 1 ) , 3 , Box :: new( proposal. clone( ) ) , proposal_len) ) ;
1173
1174
assert_ok ! ( Collective :: vote( Origin :: signed( 2 ) , hash. clone( ) , 0 , true ) ) ;
@@ -1192,7 +1193,7 @@ mod tests {
1192
1193
let proposal_len: u32 = proposal. using_encoded ( |p| p. len ( ) as u32 ) ;
1193
1194
let proposal_weight = proposal. get_dispatch_info ( ) . weight ;
1194
1195
let hash = BlakeTwo256 :: hash_of ( & proposal) ;
1195
- assert_ok ! ( Collective :: set_members( Origin :: ROOT , vec![ 1 , 2 , 3 ] , Some ( 1 ) , MAX_MEMBERS ) ) ;
1196
+ assert_ok ! ( Collective :: set_members( Origin :: root ( ) , vec![ 1 , 2 , 3 ] , Some ( 1 ) , MAX_MEMBERS ) ) ;
1196
1197
1197
1198
assert_ok ! ( Collective :: propose( Origin :: signed( 1 ) , 3 , Box :: new( proposal. clone( ) ) , proposal_len) ) ;
1198
1199
assert_ok ! ( Collective :: vote( Origin :: signed( 2 ) , hash. clone( ) , 0 , true ) ) ;
@@ -1260,7 +1261,7 @@ mod tests {
1260
1261
Collective :: voting( & hash) ,
1261
1262
Some ( Votes { index: 0 , threshold: 3 , ayes: vec![ 1 , 2 ] , nays: vec![ ] , end } )
1262
1263
) ;
1263
- assert_ok ! ( Collective :: set_members( Origin :: ROOT , vec![ 2 , 3 , 4 ] , None , MAX_MEMBERS ) ) ;
1264
+ assert_ok ! ( Collective :: set_members( Origin :: root ( ) , vec![ 2 , 3 , 4 ] , None , MAX_MEMBERS ) ) ;
1264
1265
assert_eq ! (
1265
1266
Collective :: voting( & hash) ,
1266
1267
Some ( Votes { index: 0 , threshold: 3 , ayes: vec![ 2 ] , nays: vec![ ] , end } )
@@ -1275,7 +1276,7 @@ mod tests {
1275
1276
Collective :: voting( & hash) ,
1276
1277
Some ( Votes { index: 1 , threshold: 2 , ayes: vec![ 2 ] , nays: vec![ 3 ] , end } )
1277
1278
) ;
1278
- assert_ok ! ( Collective :: set_members( Origin :: ROOT , vec![ 2 , 4 ] , None , MAX_MEMBERS ) ) ;
1279
+ assert_ok ! ( Collective :: set_members( Origin :: root ( ) , vec![ 2 , 4 ] , None , MAX_MEMBERS ) ) ;
1279
1280
assert_eq ! (
1280
1281
Collective :: voting( & hash) ,
1281
1282
Some ( Votes { index: 1 , threshold: 2 , ayes: vec![ 2 ] , nays: vec![ ] , end } )
@@ -1618,7 +1619,7 @@ mod tests {
1618
1619
// Proposal would normally succeed
1619
1620
assert_ok ! ( Collective :: vote( Origin :: signed( 2 ) , hash. clone( ) , 0 , true ) ) ;
1620
1621
// But Root can disapprove and remove it anyway
1621
- assert_ok ! ( Collective :: disapprove_proposal( Origin :: ROOT , hash. clone( ) ) ) ;
1622
+ assert_ok ! ( Collective :: disapprove_proposal( Origin :: root ( ) , hash. clone( ) ) ) ;
1622
1623
let record = |event| EventRecord { phase : Phase :: Initialization , event, topics : vec ! [ ] } ;
1623
1624
assert_eq ! ( System :: events( ) , vec![
1624
1625
record( Event :: collective_Instance1( RawEvent :: Proposed ( 1 , 0 , hash. clone( ) , 2 ) ) ) ,
0 commit comments