Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Two Companions for darwinia-v0.12.2 branch #70

Merged
merged 3 commits into from
May 6, 2022
Merged

Two Companions for darwinia-v0.12.2 branch #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7e144f
Remove runtime api companion
boundless-forest May 6, 2022
5d0ae8f
Replace darwinia-specific terms companion
boundless-forest May 6, 2022
9a75c51
Fix ci
boundless-forest May 6, 2022
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
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
matrix:
package:
- pallet-bridge-dispatch
- pallet-fee-market-rpc-runtime-api
- pallet-fee-market-rpc
- pallet-fee-market
- pallet-bridge-grandpa
- pallet-bridge-messages
Expand Down
26 changes: 0 additions & 26 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ resolver = "2"

members = [
"modules/*",
"modules/*/rpc",
"modules/*/rpc/runtime-api",
"primitives/*",
"relays/*",
]
23 changes: 0 additions & 23 deletions modules/fee-market/rpc/Cargo.toml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions modules/fee-market/rpc/runtime-api/Cargo.toml
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions modules/fee-market/rpc/runtime-api/src/lib.rs
View file
Open in desktop

This file was deleted.

91 changes: 0 additions & 91 deletions modules/fee-market/rpc/src/lib.rs
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions modules/fee-market/src/benchmarking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ fn fee_market_ready<T: Config>() {
let caller2: T::AccountId = account("source", 2, SEED);
let caller3: T::AccountId = account("source", 3, SEED);
let collateral = T::CollateralPerOrder::get();
T::RingCurrency::make_free_balance_be(&caller0, collateral.saturating_mul(10u32.into()));
T::RingCurrency::make_free_balance_be(&caller1, collateral.saturating_mul(10u32.into()));
T::RingCurrency::make_free_balance_be(&caller2, collateral.saturating_mul(10u32.into()));
T::RingCurrency::make_free_balance_be(&caller3, collateral.saturating_mul(10u32.into()));
T::Currency::make_free_balance_be(&caller0, collateral.saturating_mul(10u32.into()));
T::Currency::make_free_balance_be(&caller1, collateral.saturating_mul(10u32.into()));
T::Currency::make_free_balance_be(&caller2, collateral.saturating_mul(10u32.into()));
T::Currency::make_free_balance_be(&caller3, collateral.saturating_mul(10u32.into()));
assert_ne!(caller0, caller1);
assert_ne!(caller1, caller2);

Expand Down Expand Up @@ -69,7 +69,7 @@ benchmarks! {
enroll_and_lock_collateral {
fee_market_ready::<T>();
let relayer: T::AccountId = account("source", 100, SEED);
T::RingCurrency::make_free_balance_be(&relayer, T::CollateralPerOrder::get().saturating_mul(10u32.into()));
T::Currency::make_free_balance_be(&relayer, T::CollateralPerOrder::get().saturating_mul(10u32.into()));
let lock_collateral = T::CollateralPerOrder::get().saturating_mul(5u32.into());
}: enroll_and_lock_collateral(RawOrigin::Signed(relayer.clone()), lock_collateral, None)
verify {
Expand Down
Loading