Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
2c9c3a0
Update some renames
boundless-forest Nov 5, 2021
3a54d34
Rename
boundless-forest Nov 5, 2021
88396b2
Code clean
boundless-forest Nov 5, 2021
e57efd2
Revert reads and writes weight changes
boundless-forest Nov 5, 2021
37d92b7
Update review issues
boundless-forest Nov 5, 2021
1f790a5
Update review issues 2
boundless-forest Nov 5, 2021
d3469e7
Fix unit tests
boundless-forest Nov 5, 2021
86c0752
Add order_capacity support
boundless-forest Nov 8, 2021
4675bee
Add inc,dec relayer_order_capacity
boundless-forest Nov 8, 2021
c94e86f
Update slash logic to new design
boundless-forest Nov 8, 2021
7669a5d
Use / to get new order capacity
boundless-forest Nov 8, 2021
99155a0
Do not break api, use original interface
boundless-forest Nov 8, 2021
b032415
The code part finished, More unit tests needed.
boundless-forest Nov 8, 2021
760fc37
Remove slasher
boundless-forest Nov 8, 2021
aefc80c
Test 1
boundless-forest Nov 8, 2021
06729d4
Test 2
boundless-forest Nov 9, 2021
1d25692
Test 3
boundless-forest Nov 9, 2021
711bb66
Good news, it's close to ready
boundless-forest Nov 9, 2021
0199bcf
Code clean
boundless-forest Nov 9, 2021
e631671
Add more comment
boundless-forest Nov 9, 2021
39a5f25
Add `accept_order` and `finish_order`
boundless-forest Nov 10, 2021
1ee8da0
Update the whole slash logic
boundless-forest Nov 10, 2021
fb388ea
Clean the tests
boundless-forest Nov 10, 2021
061f59f
Fix benchmark compile && update weight
boundless-forest Nov 10, 2021
355cff4
Update type json
boundless-forest Nov 10, 2021
5a04b75
Update locked collateral support decrease
boundless-forest Nov 10, 2021
902fe89
Update error type
boundless-forest Nov 10, 2021
3d48b6c
Add locked_collateral to order struct
boundless-forest Nov 11, 2021
e96516b
Remove order_capacity, fix review issues
boundless-forest Nov 11, 2021
7edd4e5
Update comments
boundless-forest Nov 11, 2021
b5fc958
Add data migration and update json type
boundless-forest Nov 11, 2021
be9a7bb
Update docs
boundless-forest Nov 11, 2021
76ed916
Fix typo
boundless-forest Nov 11, 2021
6d13787
No need to remove slashed relayer
boundless-forest Nov 11, 2021
4f59e38
Revert to the original event
boundless-forest Nov 12, 2021
348814e
Remove Fee<T>
boundless-forest Nov 12, 2021
0cb142e
Merge branch 'master' into update-fee-market
boundless-forest Nov 12, 2021
7aa6d50
Add orders data migration
boundless-forest Nov 12, 2021
7ac1eaa
Update type.json
boundless-forest Nov 12, 2021
f5d65f7
Add `RewardMode` to the fee market
boundless-forest Nov 12, 2021
dfdbb80
Support S(t)
boundless-forest Nov 12, 2021
8bed973
Update docs
boundless-forest Nov 12, 2021
f0da259
Use UpdateRewardMode instead of OperatingMode
boundless-forest Nov 12, 2021
02b9174
Bring Slasher back
boundless-forest Nov 12, 2021
9ff3e3d
Return zero, if transfer failed
boundless-forest Nov 12, 2021
1ee88ec
Add CollateralSlashProtect and test
boundless-forest Nov 12, 2021
58366e2
Add more docs about the event params
boundless-forest Nov 15, 2021
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
1 change: 1 addition & 0 deletions Cargo.lock

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

21 changes: 12 additions & 9 deletions frame/fee-market/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use crate::Pallet as FeeMarket;
use frame_benchmarking::{account, benchmarks};
use frame_support::assert_ok;
use frame_system::RawOrigin;
use sp_runtime::traits::Saturating;

const SEED: u32 = 0;

Expand All @@ -32,7 +33,7 @@ fn fee_market_ready<T: Config>() {
let caller1: T::AccountId = account("source", 1, SEED);
let caller2: T::AccountId = account("source", 2, SEED);
let caller3: T::AccountId = account("source", 3, SEED);
let collateral = T::MiniumLockCollateral::get();
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()));
Expand Down Expand Up @@ -68,8 +69,8 @@ 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::MiniumLockCollateral::get().saturating_mul(10u32.into()));
let lock_collateral = T::MiniumLockCollateral::get().saturating_mul(5u32.into());
T::RingCurrency::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 {
assert!(<FeeMarket<T>>::is_enrolled(&relayer));
Expand All @@ -79,21 +80,21 @@ benchmarks! {
update_locked_collateral {
fee_market_ready::<T>();
let caller3: T::AccountId = account("source", 3, SEED);
let new_collateral = T::MiniumLockCollateral::get().saturating_mul(5u32.into());
let new_collateral = T::CollateralPerOrder::get().saturating_mul(5u32.into());
}: update_locked_collateral(RawOrigin::Signed(caller3.clone()), new_collateral)
verify {
let relayer = <FeeMarket<T>>::get_relayer(&caller3);
assert_eq!(relayer.collateral, T::MiniumLockCollateral::get().saturating_mul(5u32.into()));
let relayer = <FeeMarket<T>>::relayer(&caller3);
assert_eq!(relayer.collateral, T::CollateralPerOrder::get().saturating_mul(5u32.into()));
}

update_relay_fee {
fee_market_ready::<T>();
let caller3: T::AccountId = account("source", 3, SEED);
let new_fee = T::MinimumRelayFee::get().saturating_mul(10u32.into());
let new_fee = T::CollateralPerOrder::get().saturating_mul(10u32.into());
}: update_relay_fee(RawOrigin::Signed(caller3.clone()), new_fee)
verify {
let relayer = <FeeMarket<T>>::get_relayer(&caller3);
assert_eq!(relayer.fee, T::MinimumRelayFee::get().saturating_mul(10u32.into()));
let relayer = <FeeMarket<T>>::relayer(&caller3);
assert_eq!(relayer.fee, T::CollateralPerOrder::get().saturating_mul(10u32.into()));
}

cancel_enrollment {
Expand All @@ -105,4 +106,6 @@ benchmarks! {
assert_eq!(<FeeMarket<T>>::relayers().len(), 3);
}

set_slash_protect {
}:set_slash_protect(RawOrigin::Root, T::CollateralPerOrder::get().saturating_mul(1u32.into()))
}
Loading