diff --git a/balances/src/benchmarking.rs b/balances/src/benchmarking.rs index 009817e9..3469c0dc 100644 --- a/balances/src/benchmarking.rs +++ b/balances/src/benchmarking.rs @@ -31,6 +31,11 @@ benchmarks! { let balance_bob: f64 = Pallet::::balance(cid, &bob).lossy_into(); assert_abs_diff_eq!(balance_bob, 12f64, epsilon= 0.0001); } + + set_fee_conversion_factor { + let alice: T::AccountId = account("alice", 1, 1); + let f : FeeConversionFactorType = 1; + }: _(RawOrigin::Root, f) } impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::TestRuntime); diff --git a/faucet/src/benchmarking.rs b/faucet/src/benchmarking.rs index 81342048..1e4f530b 100644 --- a/faucet/src/benchmarking.rs +++ b/faucet/src/benchmarking.rs @@ -60,10 +60,10 @@ benchmarks! { create_faucet { let cid = create_community::(); let zoran = account("zoran", 1, 1); - ::Currency::make_free_balance_be(&zoran, 200_000_000u32.into()); + ::Currency::make_free_balance_be(&zoran, 200_000_000_000_000u64.saturated_into()); let faucet_name = FaucetNameType::from_str("SomeFaucetNameWith64Charsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa").unwrap(); - let amount: BalanceOf = 100_000_000u32.into(); - let drip_amount: BalanceOf = 10_000u32.into(); + let amount: BalanceOf = 100_000_000_000_000u64.saturated_into(); + let drip_amount: BalanceOf = 10_000_000_000_000u64.saturated_into(); let whitelist = BoundedVec::try_from(vec![cid; 1024]).unwrap(); assert!(>::iter().next().is_none()); }: _(RawOrigin::Signed(zoran), faucet_name, amount, Some(whitelist), drip_amount) @@ -79,10 +79,10 @@ benchmarks! { let dripper = account::("dripper", 2, 2); frame_support::storage::unhashed::put_raw(&participant_reputation((cid, cindex), &dripper), &Reputation::VerifiedUnlinked.encode()); - ::Currency::make_free_balance_be(&zoran, 200_000_000u32.into()); + ::Currency::make_free_balance_be(&zoran, 200_000_000_000_000u64.saturated_into()); let faucet_name = FaucetNameType::from_str("Some Faucet Name").unwrap(); - let amount: BalanceOf = 100_000_000u32.into(); - let drip_amount: BalanceOf = 10_000u32.into(); + let amount: BalanceOf = 100_000_000_000_000u64.saturated_into(); + let drip_amount: BalanceOf = 10_000_000_000_000u64.saturated_into(); let whitelist = BoundedVec::try_from(vec![cid; 10]).unwrap(); assert!(>::iter().next().is_none()); FaucetPallet::::create_faucet(RawOrigin::Signed(zoran).into(), faucet_name, amount, Some(whitelist), drip_amount).ok(); @@ -90,7 +90,7 @@ benchmarks! { }: _(RawOrigin::Signed(dripper.clone()), faucet_account, cid, cindex) verify { - assert_eq!(::Currency::free_balance(&dripper), 10_000u32.into()); + assert_eq!(::Currency::free_balance(&dripper), 10_000_000_000_000u64.saturated_into()); } dissolve_faucet { @@ -101,10 +101,10 @@ benchmarks! { let beneficiary = account::("beneficiary", 3, 3); frame_support::storage::unhashed::put_raw(&participant_reputation((cid, cindex), &dripper), &Reputation::VerifiedUnlinked.encode()); - ::Currency::make_free_balance_be(&zoran, 200_000_000u32.into()); + ::Currency::make_free_balance_be(&zoran, 200_000_000_000_000u64.saturated_into()); let faucet_name = FaucetNameType::from_str("Some Faucet Name").unwrap(); - let amount: BalanceOf = 100_000_000u32.into(); - let drip_amount: BalanceOf = 10_000u32.into(); + let amount: BalanceOf = 100_000_000_000_000u64.saturated_into(); + let drip_amount: BalanceOf = 10_000_000_000_000u64.saturated_into(); let whitelist = BoundedVec::try_from(vec![cid; 10]).unwrap(); assert!(>::iter().next().is_none()); FaucetPallet::::create_faucet(RawOrigin::Signed(zoran).into(), faucet_name, amount, Some(whitelist), drip_amount).ok(); @@ -113,7 +113,7 @@ benchmarks! { }: _(RawOrigin::Root, faucet_account, beneficiary.clone()) verify { - assert_eq!(::Currency::free_balance(&beneficiary), 99_990_000u32.into()); + assert_eq!(::Currency::free_balance(&beneficiary), 90_000_000_000_000u64.saturated_into()); } @@ -125,25 +125,25 @@ benchmarks! { let beneficiary = account::("beneficiary", 3, 3); frame_support::storage::unhashed::put_raw(&participant_reputation((cid, cindex), &dripper), &Reputation::VerifiedUnlinked.encode()); - ::Currency::make_free_balance_be(&zoran, 100_000_000u32.into()); + ::Currency::make_free_balance_be(&zoran, 100_000_000_000_000u64.saturated_into()); let faucet_name = FaucetNameType::from_str("Some Faucet Name").unwrap(); - let amount: BalanceOf = 25_000_000u32.into(); - let drip_amount: BalanceOf = 10_000_000u32.into(); + let amount: BalanceOf = 25_000_000_000_000u64.saturated_into(); + let drip_amount: BalanceOf = 10_000_000_000_000u64.saturated_into(); let whitelist = BoundedVec::try_from(vec![cid; 10]).unwrap(); assert!(>::iter().next().is_none()); FaucetPallet::::create_faucet(RawOrigin::Signed(zoran.clone()).into(), faucet_name, amount, Some(whitelist), drip_amount).ok(); let faucet_account = >::iter().next().unwrap().0; FaucetPallet::::drip(RawOrigin::Signed(dripper.clone()).into(), faucet_account.clone(), cid, cindex).ok(); - assert_eq!(::Currency::free_balance(&faucet_account), 15_000_000u32.into()); + assert_eq!(::Currency::free_balance(&faucet_account), 15_000_000_000_000u64.saturated_into()); }: _(RawOrigin::Signed(zoran), faucet_account.clone()) verify { - assert_eq!(::Currency::free_balance(&faucet_account), 0u32.into()); + assert_eq!(::Currency::free_balance(&faucet_account), 0u64.saturated_into()); } set_reserve_amount { - }: _(RawOrigin::Root, 1337u32.into()) + }: _(RawOrigin::Root, 1337u64.saturated_into()) verify { - assert_eq!(>::get(), 1337u32.into()); + assert_eq!(>::get(), 1337u64.saturated_into()); } }