diff --git a/Cargo.lock b/Cargo.lock index fd2b22c00..8c6d9d0f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9987,7 +9987,7 @@ dependencies = [ [[package]] name = "pallet-dispenser" -version = "0.2.0" +version = "0.2.1" dependencies = [ "alloy-primitives 0.7.7", "alloy-sol-types 0.7.7", diff --git a/pallets/dispenser/Cargo.toml b/pallets/dispenser/Cargo.toml index 7e38ce21a..bb99caae3 100644 --- a/pallets/dispenser/Cargo.toml +++ b/pallets/dispenser/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pallet-dispenser" -version = "0.2.0" +version = "0.2.1" edition = "2021" [package.metadata.docs.rs] diff --git a/pallets/dispenser/src/benchmarking.rs b/pallets/dispenser/src/benchmarking.rs index 799136f95..25d22c0ce 100644 --- a/pallets/dispenser/src/benchmarking.rs +++ b/pallets/dispenser/src/benchmarking.rs @@ -22,9 +22,10 @@ mod benches { #[benchmark] fn set_faucet_balance() { DispenserConfig::::put(DispenserConfigData { paused: false }); + let old = FaucetBalanceWei::::get(); #[extrinsic_call] set_faucet_balance(RawOrigin::Root, 123u128); - assert_eq!(FaucetBalanceWei::::get(), 123u128); + assert_eq!(FaucetBalanceWei::::get(), old + 123u128); } #[benchmark] @@ -59,26 +60,21 @@ 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( - faucet_asset, - &signet_admin, - 340282366920938463463374607431768211455, - ); - ::Currency::set_balance(fee_asset, &pallet_account, 340266920938463463374607431768211455); - ::Currency::set_balance( - faucet_asset, - &pallet_account, - 340282366920938463463374607431768211455, - ); + let large_balance: u128 = 1_000_000_000_000_000_000_000; + ::Currency::set_balance(fee_asset, &signet_admin, large_balance); + ::Currency::set_balance(faucet_asset, &signet_admin, large_balance); + ::Currency::set_balance(fee_asset, &pallet_account, large_balance); + ::Currency::set_balance(faucet_asset, &pallet_account, large_balance); let ed_native: BalanceOf = ::Currency::minimum_balance(); - assert_ok!(pallet_signet::Pallet::::initialize( - RawOrigin::Root.into(), - signet_admin, - ed_native, - chain_id, - )); + if pallet_signet::Admin::::get().is_none() { + 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); diff --git a/scripts/benchmarking.sh b/scripts/benchmarking.sh index 99fbea730..95c6fd15c 100755 --- a/scripts/benchmarking.sh +++ b/scripts/benchmarking.sh @@ -153,7 +153,7 @@ if [[ "${ALL}" -eq 1 ]]; then for option in "${options[@]}"; do _path="${OUTPUT}${option}.rs" - touch "${_path}" # TODO: Remove this once benchmarking-cli doesn't fail on missing files + chmod u+w "${_path}" 2>/dev/null; touch "${_path}" # TODO: Remove this once benchmarking-cli doesn't fail on missing files bench "${option}" '*' "${CHECK}" "${_path}" done elif [[ "${ARGS[0]}" == *","* ]]; then @@ -162,7 +162,7 @@ elif [[ "${ARGS[0]}" == *","* ]]; then for _pallet in "${_pallets[@]}"; do _pallet_trimmed="$(echo "${_pallet}" | xargs)" _path="${OUTPUT}${_pallet_trimmed}.rs" - touch "${_path}" # TODO: Remove this once benchmarking-cli doesn't fail on missing files + chmod u+w "${_path}" 2>/dev/null; touch "${_path}" # TODO: Remove this once benchmarking-cli doesn't fail on missing files bench "${_pallet_trimmed}" '*' "${CHECK}" "${_path}" done elif [[ ${#ARGS[@]} -ne 2 && ${#ARGS[@]} -ne 3 ]]; then