@@ -28,15 +28,13 @@ pub use pallet::*;
2828use parity_scale_codec:: { Decode , Encode } ;
2929use scale_info:: TypeInfo ;
3030use sp_io:: { crypto:: secp256k1_ecdsa_recover, hashing:: keccak_256} ;
31- #[ cfg( feature = "std" ) ]
32- use sp_runtime:: traits:: Zero ;
3331use sp_runtime:: {
34- traits:: { CheckedSub , DispatchInfoOf , SignedExtension } ,
32+ traits:: { CheckedSub , DispatchInfoOf , SignedExtension , Zero } ,
3533 transaction_validity:: {
3634 InvalidTransaction , TransactionValidity , TransactionValidityError , ValidTransaction ,
3735 } ,
3836} ;
39- use sp_std:: { fmt:: Debug , prelude:: * , vec} ;
37+ use sp_std:: { fmt:: Debug , prelude:: * , vec, vec :: Vec } ;
4038
4139type CurrencyOf < T > = <<T as Config >:: VestingSchedule as VestingSchedule <
4240 <T as frame_system:: Config >:: AccountId ,
@@ -85,7 +83,7 @@ pub mod pallet {
8583 pub trait Config : frame_system:: Config {
8684 /// The overarching event type.
8785type RuntimeEvent : From < Event < Self > > + IsType < <Self as frame_system:: Config >:: RuntimeEvent > ;
88- type VestingSchedule : VestingSchedule < Self :: AccountId , Moment = Self :: BlockNumber > ;
86+ type VestingSchedule : VestingSchedule < Self :: AccountId , Moment = BlockNumberFor < Self > > ;
8987 #[ pallet:: constant]
9088 type Prefix : Get < & ' static [ u8 ] > ;
9189 type MoveClaimOrigin : EnsureOrigin < Self :: RuntimeOrigin > ;
@@ -131,7 +129,7 @@ pub mod pallet {
131129#[ pallet:: storage]
132130 #[ pallet:: getter( fn vesting) ]
133131 pub ( super ) type Vesting < T : Config > =
134- StorageMap < _ , Identity , EthereumAddress , ( BalanceOf < T > , BalanceOf < T > , T :: BlockNumber ) > ;
132+ StorageMap < _ , Identity , EthereumAddress , ( BalanceOf < T > , BalanceOf < T > , BlockNumberFor < T > ) > ;
135133
136134 /// The statement kind that must be signed, if any.
137135#[ pallet:: storage]
@@ -142,22 +140,16 @@ pub mod pallet {
142140 pub ( super ) type Preclaims < T : Config > = StorageMap < _ , Identity , T :: AccountId , EthereumAddress > ;
143141
144142 #[ allow( clippy:: type_complexity) ]
143+ #[ derive( frame_support:: DefaultNoBound ) ]
145144 #[ pallet:: genesis_config]
146145 pub struct GenesisConfig < T : Config > {
147146 pub claims :
148147 Vec < ( EthereumAddress , BalanceOf < T > , Option < T :: AccountId > , Option < StatementKind > ) > ,
149- pub vesting : Vec < ( EthereumAddress , ( BalanceOf < T > , BalanceOf < T > , T :: BlockNumber ) ) > ,
150- }
151-
152- #[ cfg( feature = "std" ) ]
153- impl < T : Config > Default for GenesisConfig < T > {
154- fn default ( ) -> Self {
155- GenesisConfig { claims : Default :: default ( ) , vesting : Default :: default ( ) }
156- }
148+ pub vesting : Vec < ( EthereumAddress , ( BalanceOf < T > , BalanceOf < T > , BlockNumberFor < T > ) ) > ,
157149 }
158150
159151 #[ pallet:: genesis_build]
160- impl < T : Config > GenesisBuild < T > for GenesisConfig < T > {
152+ impl < T : Config > BuildGenesisConfig for GenesisConfig < T > {
161153 fn build ( & self ) {
162154 // build `Claims`
163155 self . claims . iter ( ) . map ( |( a, b, _, _) | ( a, b) ) . for_each ( |( a, b) | {
@@ -257,7 +249,7 @@ pub mod pallet {
257249 origin : OriginFor < T > ,
258250 who : EthereumAddress ,
259251 value : BalanceOf < T > ,
260- vesting_schedule : Option < ( BalanceOf < T > , BalanceOf < T > , T :: BlockNumber ) > ,
252+ vesting_schedule : Option < ( BalanceOf < T > , BalanceOf < T > , BlockNumberFor < T > ) > ,
261253 statement : Option < StatementKind > ,
262254 ) -> DispatchResult {
263255 ensure_root ( origin) ?;
@@ -639,33 +631,30 @@ mod tests {
639631
640632 use parity_scale_codec:: Encode ;
641633 use sp_core:: H256 ;
642- use sp_runtime:: { DispatchError :: Token , TokenError :: Frozen } ;
634+ use sp_runtime:: { generic , DispatchError :: Token , TokenError :: Frozen } ;
643635 // The testing primitives are very useful for avoiding having to work with signatures
644636 // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required.
645637 use super :: Call as ClaimsCall ;
646638 use frame_support:: {
647639 assert_err, assert_noop, assert_ok,
648640 dispatch:: { DispatchError :: BadOrigin , GetDispatchInfo , Pays } ,
649641 ord_parameter_types, parameter_types,
650- traits:: { ExistenceRequirement , GenesisBuild , WithdrawReasons } ,
642+ traits:: { ExistenceRequirement , WithdrawReasons } ,
651643 } ;
652644
653645 use sp_runtime:: {
654646 testing:: Header ,
655647 traits:: { BlakeTwo256 , Identity , IdentityLookup } ,
656648 transaction_validity:: TransactionLongevity ,
649+ BuildStorage ,
657650 } ;
658651
659652 type UncheckedExtrinsic = frame_system:: mocking:: MockUncheckedExtrinsic < Test > ;
660- type Block = frame_system:: mocking:: MockBlock < Test > ;
661653
662654 frame_support:: construct_runtime!(
663- pub enum Test where
664- Block = Block ,
665- NodeBlock = Block ,
666- UncheckedExtrinsic = UncheckedExtrinsic ,
655+ pub enum Test
667656 {
668- System : frame_system:: { Pallet , Call , Config , Storage , Event <T >} ,
657+ System : frame_system:: { Pallet , Call , Config < T > , Storage , Event <T >} ,
669658 Balances : pallet_balances:: { Pallet , Call , Storage , Config <T >, Event <T >} ,
670659 Vesting : pallet_vesting:: { Pallet , Call , Storage , Config <T >, Event <T >} ,
671660 Claims : super :: pallet:: { Pallet , Call , Storage , Config <T >, Event <T >, ValidateUnsigned } ,
@@ -679,16 +668,15 @@ mod tests {
679668 type BaseCallFilter = frame_support:: traits:: Everything ;
680669 type BlockWeights = ( ) ;
681670 type BlockLength = ( ) ;
671+ type Block = generic:: Block < Header , UncheckedExtrinsic > ;
682672 type DbWeight = ( ) ;
683673 type RuntimeOrigin = RuntimeOrigin ;
684674 type RuntimeCall = RuntimeCall ;
685- type Index = u64 ;
686- type BlockNumber = u64 ;
675+ type Nonce = u64 ;
687676 type Hash = H256 ;
688677 type Hashing = BlakeTwo256 ;
689678 type AccountId = u64 ;
690679 type Lookup = IdentityLookup < u64 > ;
691- type Header = Header ;
692680 type RuntimeEvent = RuntimeEvent ;
693681 type BlockHashCount = BlockHashCount ;
694682 type Version = ( ) ;
@@ -716,8 +704,8 @@ mod tests {
716704 type MaxReserves = ( ) ;
717705 type ReserveIdentifier = [ u8 ; 8 ] ;
718706 type WeightInfo = ( ) ;
719- type HoldIdentifier = ( ) ;
720707 type FreezeIdentifier = ( ) ;
708+ type RuntimeHoldReason = ( ) ;
721709 type MaxHolds = ( ) ;
722710 type MaxFreezes = ( ) ;
723711 }
@@ -772,7 +760,7 @@ mod tests {
772760 // This function basically just builds a genesis storage key/value store according to
773761 // our desired mockup.
774762 pub fn new_test_ext ( ) -> sp_io:: TestExternalities {
775- let mut t = frame_system:: GenesisConfig :: default ( ) . build_storage :: < Test > ( ) . unwrap ( ) ;
763+ let mut t = frame_system:: GenesisConfig :: < Test > :: default ( ) . build_storage ( ) . unwrap ( ) ;
776764 // We use default for brevity, but you can configure as desired if needed.
777765 pallet_balances:: GenesisConfig :: < Test > :: default ( )
778766 . assimilate_storage ( & mut t)
0 commit comments