Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Deprecate Currency: Companion for #12951 #2334

Merged
paritytech-processbot merged 16 commits into from
Mar 20, 2023
Merged

Deprecate Currency: Companion for #12951 #2334

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0fdf135
Fix APIs
gavofyork Feb 9, 2023
53b71c6
Merge remote-tracking branch 'origin/master' into gav-hold-freeze
gavofyork Mar 15, 2023
6326e19
Reflect API changes
gavofyork Mar 16, 2023
8dc1fb9
Everything builds
gavofyork Mar 16, 2023
ed0bbb8
Fixes
gavofyork Mar 16, 2023
a5cc450
Fixes
gavofyork Mar 16, 2023
19e5013
Update Cargo.toml
gavofyork Mar 16, 2023
ea3be64
Merge remote-tracking branch 'origin/master' into gav-hold-freeze
gavofyork Mar 18, 2023
656aa23
Fixes
gavofyork Mar 18, 2023
fcaed93
Fixes
gavofyork Mar 18, 2023
dbb35ed
No networks use freezes/holds
gavofyork Mar 18, 2023
03cc080
Merge remote-tracking branch 'origin/master' into gav-hold-freeze
Mar 20, 2023
be0bd7c
update lockfile for {"polkadot", "substrate"}
Mar 20, 2023
a5434cd
Fix test
ggwpez Mar 20, 2023
98f94b2
Fix test
gavofyork Mar 20, 2023
d39e520
Merge branch 'gav-hold-freeze' of github.com:paritytech/cumulus into …
gavofyork Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes
  • Loading branch information
@gavofyork
gavofyork committed Mar 18, 2023
commit fcaed93651a28e15b7f280441e1333e22a9b6106
6 changes: 4 additions & 2 deletions parachains/runtimes/assets/statemine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,8 @@ mod tests {
use pallet_balances::WeightInfo;
let block = RuntimeBlockWeights::get().max_block;
let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
let transfer = base + weights::pallet_balances::WeightInfo::<Runtime>::transfer();
let transfer =
base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();

let fit = block.checked_div_per_component(&transfer).unwrap_or_default();
assert!(fit >= 1000, "{} should be at least 1000", fit);
Expand All @@ -1154,7 +1155,8 @@ mod tests {
fn sane_transfer_fee() {
use pallet_balances::WeightInfo;
let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
let transfer = base + weights::pallet_balances::WeightInfo::<Runtime>::transfer();
let transfer =
base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();

let fee: Balance = fee::WeightToFee::weight_to_fee(&transfer);
assert!(fee <= CENTS, "{} MILLICENTS should be at most 1000", fee / MILLICENTS);
Expand Down