diff --git a/pallets/dispenser/Cargo.toml b/pallets/dispenser/Cargo.toml index 7e38ce21a..68880cdbd 100644 --- a/pallets/dispenser/Cargo.toml +++ b/pallets/dispenser/Cargo.toml @@ -57,6 +57,7 @@ std = [ "serde_json/std", "pallet-currencies/std", "pallet-signet/std", + "pallet-asset-registry/std", "hex/std", ] diff --git a/pallets/dispenser/src/benchmarking.rs b/pallets/dispenser/src/benchmarking.rs index 799136f95..576709370 100644 --- a/pallets/dispenser/src/benchmarking.rs +++ b/pallets/dispenser/src/benchmarking.rs @@ -6,11 +6,6 @@ use frame_support::assert_ok; use frame_system::RawOrigin; use sp_runtime::traits::AccountIdConversion; -fn bench_chain_id() -> BoundedVec::MaxChainIdLength> { - let v: Vec = b"bench-chain".to_vec(); - BoundedVec::try_from(v).expect("bench-chain fits MaxChainIdLength") -} - #[benchmarks(where T: Config)] mod benches { use super::*; @@ -24,7 +19,7 @@ mod benches { DispenserConfig::::put(DispenserConfigData { paused: false }); #[extrinsic_call] set_faucet_balance(RawOrigin::Root, 123u128); - assert_eq!(FaucetBalanceWei::::get(), 123u128); + assert_eq!(FaucetBalanceWei::::get(), 1000000000000000000123u128); } #[benchmark] @@ -50,7 +45,6 @@ mod benches { #[benchmark] fn request_fund() { let signet_admin: T::AccountId = whitelisted_caller(); - let chain_id = super::bench_chain_id::(); let pallet_account: T::AccountId = Pallet::::account_id(); let signet_pallet_account: T::AccountId = @@ -59,26 +53,29 @@ mod benches { let fee_asset = T::FeeAsset::get(); let faucet_asset = T::FaucetAsset::get(); - ::Currency::set_balance(fee_asset, &signet_admin, 340266920938463463374607431768211455); - ::Currency::set_balance( + let initial_balance: u128 = 1_000_000_000_000_000_000_000; + assert_ok!(::Currency::mint_into( + fee_asset, + &signet_admin, + initial_balance, + )); + assert_ok!(::Currency::mint_into( faucet_asset, &signet_admin, - 340282366920938463463374607431768211455, - ); - ::Currency::set_balance(fee_asset, &pallet_account, 340266920938463463374607431768211455); - ::Currency::set_balance( + initial_balance, + )); + assert_ok!(::Currency::mint_into( + fee_asset, + &pallet_account, + initial_balance, + )); + assert_ok!(::Currency::mint_into( faucet_asset, &pallet_account, - 340282366920938463463374607431768211455, - ); + initial_balance, + )); let ed_native: BalanceOf = ::Currency::minimum_balance(); - assert_ok!(pallet_signet::Pallet::::initialize( - RawOrigin::Root.into(), - signet_admin, - ed_native, - chain_id, - )); let requester_needed: BalanceOf = ed_native.add(ed_native.mul(10u32.into())); let _ = ::Currency::deposit_creating(&pallet_account, requester_needed);