Skip to content

Commit

Permalink
refactor!: rename interbtc to ibtc
Browse files Browse the repository at this point in the history 
Signed-off-by: Gregory Hill <gregorydhill@outlook.com>
  • Loading branch information
@gregdhill
gregdhill committed Apr 6, 2022
1 parent 248535f commit 6a79dff
Show file tree
Hide file tree
Showing 35 changed files with 131 additions and 144 deletions.
2 changes: 1 addition & 1 deletion crates/currency/src/lib.rs
View file
Expand Up @@ -81,7 +81,7 @@ pub mod pallet {
#[pallet::constant]
type GetRelayChainCurrencyId: Get<CurrencyId<Self>>;

/// Wrapped currency e.g. INTERBTC/KBTC
/// Wrapped currency e.g. IBTC/KBTC
#[pallet::constant]
type GetWrappedCurrencyId: Get<CurrencyId<Self>>;

Expand Down
2 changes: 1 addition & 1 deletion crates/currency/src/mock.rs
View file
Expand Up @@ -72,7 +72,7 @@ impl frame_system::Config for Test {
parameter_types! {
pub const GetNativeCurrencyId: CurrencyId = Token(INTR);
pub const GetRelayChainCurrencyId: CurrencyId = Token(DOT);
pub const GetWrappedCurrencyId: CurrencyId = Token(INTERBTC);
pub const GetWrappedCurrencyId: CurrencyId = Token(IBTC);
pub const MaxLocks: u32 = 50;
}

Expand Down
2 changes: 1 addition & 1 deletion crates/fee/src/mock.rs
View file
Expand Up @@ -83,7 +83,7 @@ impl frame_system::Config for Test {
parameter_types! {
pub const GetNativeCurrencyId: CurrencyId = Token(INTR);
pub const GetRelayChainCurrencyId: CurrencyId = Token(DOT);
pub const GetWrappedCurrencyId: CurrencyId = Token(INTERBTC);
pub const GetWrappedCurrencyId: CurrencyId = Token(IBTC);
pub const MaxLocks: u32 = 50;
}

Expand Down
4 changes: 2 additions & 2 deletions crates/fee/src/tests.rs
View file
Expand Up @@ -8,8 +8,8 @@ fn should_get_issue_fee() {
run_test(|| {
<IssueFee<Test>>::put(UnsignedFixedPoint::checked_from_rational(10, 100).unwrap());
assert_ok!(
Fee::get_issue_fee(&Amount::<Test>::new(100, Token(INTERBTC))),
Amount::<Test>::new(10, Token(INTERBTC))
Fee::get_issue_fee(&Amount::<Test>::new(100, Token(IBTC))),
Amount::<Test>::new(10, Token(IBTC))
);
})
}
2 changes: 1 addition & 1 deletion crates/issue/src/mock.rs
View file
Expand Up @@ -94,7 +94,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

parameter_types! {
pub const GetCollateralCurrencyId: CurrencyId = DEFAULT_COLLATERAL_CURRENCY;
Expand Down
6 changes: 3 additions & 3 deletions crates/nomination/src/mock.rs
View file
Expand Up @@ -93,7 +93,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

pub const DEFAULT_CURRENCY_PAIR: VaultCurrencyPair<CurrencyId> = VaultCurrencyPair {
collateral: DEFAULT_COLLATERAL_CURRENCY,
Expand Down Expand Up @@ -312,8 +312,8 @@ impl ExtBuilder {
balances: vec![
(ALICE.account_id, Token(DOT), ALICE_BALANCE),
(BOB.account_id, Token(DOT), BOB_BALANCE),
(ALICE.account_id, Token(INTERBTC), ALICE_BALANCE),
(BOB.account_id, Token(INTERBTC), BOB_BALANCE),
(ALICE.account_id, Token(IBTC), ALICE_BALANCE),
(BOB.account_id, Token(IBTC), BOB_BALANCE),
],
})
}
Expand Down
2 changes: 1 addition & 1 deletion crates/oracle/src/mock.rs
View file
Expand Up @@ -81,7 +81,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

parameter_types! {
pub const GetCollateralCurrencyId: CurrencyId = DEFAULT_COLLATERAL_CURRENCY;
Expand Down
8 changes: 4 additions & 4 deletions crates/redeem/src/mock.rs
View file
Expand Up @@ -94,7 +94,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

pub const DEFAULT_CURRENCY_PAIR: VaultCurrencyPair<CurrencyId> = VaultCurrencyPair {
collateral: DEFAULT_COLLATERAL_CURRENCY,
Expand Down Expand Up @@ -325,9 +325,9 @@ impl ExtBuilder {
(USER, Token(DOT), ALICE_BALANCE),
(VAULT.account_id, Token(DOT), VAULT_BALANCE),
(CAROL, Token(DOT), CAROL_BALANCE),
(USER, Token(INTERBTC), ALICE_BALANCE),
(VAULT.account_id, Token(INTERBTC), VAULT_BALANCE),
(CAROL, Token(INTERBTC), CAROL_BALANCE),
(USER, Token(IBTC), ALICE_BALANCE),
(VAULT.account_id, Token(IBTC), VAULT_BALANCE),
(CAROL, Token(IBTC), CAROL_BALANCE),
],
})
}
Expand Down
2 changes: 1 addition & 1 deletion crates/refund/src/mock.rs
View file
Expand Up @@ -102,7 +102,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

pub const DEFAULT_CURRENCY_PAIR: VaultCurrencyPair<CurrencyId> = VaultCurrencyPair {
collateral: DEFAULT_COLLATERAL_CURRENCY,
Expand Down
2 changes: 1 addition & 1 deletion crates/refund/src/tests.rs
View file
Expand Up @@ -17,7 +17,7 @@ fn dummy_merkle_proof() -> MerkleProof {
}

fn wrapped(amount: u128) -> Amount<Test> {
Amount::new(amount, Token(INTERBTC))
Amount::new(amount, Token(IBTC))
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion crates/relay/src/mock.rs
View file
Expand Up @@ -97,7 +97,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

pub const DEFAULT_CURRENCY_PAIR: VaultCurrencyPair<CurrencyId> = VaultCurrencyPair {
collateral: DEFAULT_COLLATERAL_CURRENCY,
Expand Down
2 changes: 1 addition & 1 deletion crates/replace/src/mock.rs
View file
Expand Up @@ -94,7 +94,7 @@ impl frame_system::Config for Test {

pub const DEFAULT_COLLATERAL_CURRENCY: CurrencyId = Token(DOT);
pub const DEFAULT_NATIVE_CURRENCY: CurrencyId = Token(INTR);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(INTERBTC);
pub const DEFAULT_WRAPPED_CURRENCY: CurrencyId = Token(IBTC);

parameter_types! {
pub const GetCollateralCurrencyId: CurrencyId = DEFAULT_COLLATERAL_CURRENCY;
Expand Down
2 changes: 1 addition & 1 deletion crates/reward/src/mock.rs
View file
Expand Up @@ -63,7 +63,7 @@ impl frame_system::Config for Test {

parameter_types! {
pub const GetNativeCurrencyId: CurrencyId = Token(INTR);
pub const GetWrappedCurrencyId: CurrencyId = Token(INTERBTC);
pub const GetWrappedCurrencyId: CurrencyId = Token(IBTC);
}

impl Config for Test {
Expand Down
59 changes: 28 additions & 31 deletions crates/reward/src/tests.rs
View file
Expand Up @@ -16,9 +16,9 @@ fn should_distribute_rewards_equally() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(50)));
assert_ok!(Reward::deposit_stake(&BOB, fixed!(50)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(100)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 50);
assert_ok!(Reward::compute_reward(Token(INTERBTC), &BOB), 50);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(100)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 50);
assert_ok!(Reward::compute_reward(Token(IBTC), &BOB), 50);
})
}

Expand All @@ -27,22 +27,22 @@ fn should_distribute_uneven_rewards_equally() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(50)));
assert_ok!(Reward::deposit_stake(&BOB, fixed!(50)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(451)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 225);
assert_ok!(Reward::compute_reward(Token(INTERBTC), &BOB), 225);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(451)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 225);
assert_ok!(Reward::compute_reward(Token(IBTC), &BOB), 225);
})
}

#[test]
fn should_not_update_previous_rewards() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(40)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(1000)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 1000);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(1000)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 1000);

assert_ok!(Reward::deposit_stake(&BOB, fixed!(20)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 1000);
assert_ok!(Reward::compute_reward(Token(INTERBTC), &BOB), 0);
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 1000);
assert_ok!(Reward::compute_reward(Token(IBTC), &BOB), 0);
})
}

Expand All @@ -51,30 +51,30 @@ fn should_withdraw_reward() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(45)));
assert_ok!(Reward::deposit_stake(&BOB, fixed!(55)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(2344)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &BOB), 1289);
assert_ok!(Reward::withdraw_reward(&ALICE, Token(INTERBTC)), 1054);
assert_ok!(Reward::compute_reward(Token(INTERBTC), &BOB), 1289);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(2344)));
assert_ok!(Reward::compute_reward(Token(IBTC), &BOB), 1289);
assert_ok!(Reward::withdraw_reward(&ALICE, Token(IBTC)), 1054);
assert_ok!(Reward::compute_reward(Token(IBTC), &BOB), 1289);
})
}

#[test]
fn should_withdraw_stake() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(1312)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(4242)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 4242);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(4242)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 4242);
assert_ok!(Reward::withdraw_stake(&ALICE, fixed!(1312)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 4242);
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 4242);
})
}

#[test]
fn should_not_withdraw_stake_if_balance_insufficient() {
run_test(|| {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(100)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(2000)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 2000);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(2000)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 2000);
assert_err!(
Reward::withdraw_stake(&ALICE, fixed!(200)),
TestError::InsufficientFunds
Expand All @@ -89,19 +89,19 @@ fn should_deposit_stake() {
assert_ok!(Reward::deposit_stake(&ALICE, fixed!(25)));
assert_eq!(Reward::stake(&ALICE), fixed!(50));
assert_ok!(Reward::deposit_stake(&BOB, fixed!(50)));
assert_ok!(Reward::distribute_reward(Token(INTERBTC), fixed!(1000)));
assert_ok!(Reward::compute_reward(Token(INTERBTC), &ALICE), 500);
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(1000)));
assert_ok!(Reward::compute_reward(Token(IBTC), &ALICE), 500);
})
}

#[test]
fn should_not_distribute_rewards_without_stake() {
run_test(|| {
assert_err!(
Reward::distribute_reward(Token(INTERBTC), fixed!(1000)),
Reward::distribute_reward(Token(IBTC), fixed!(1000)),
TestError::ZeroTotalStake
);
assert_eq!(Reward::total_rewards(Token(INTERBTC)), fixed!(0));
assert_eq!(Reward::total_rewards(Token(IBTC)), fixed!(0));
})
}

Expand All @@ -114,14 +114,11 @@ fn should_distribute_with_many_rewards() {
assert_ok!(Reward::deposit_stake(&BOB, fixed!(234234444)));
for _ in 0..30 {
// NOTE: this will overflow compute_reward with > u32
assert_ok!(Reward::distribute_reward(
Token(INTERBTC),
fixed!(rng.gen::<u32>() as i128)
));
assert_ok!(Reward::distribute_reward(Token(IBTC), fixed!(rng.gen::<u32>() as i128)));
}
let alice_reward = Reward::compute_reward(Token(INTERBTC), &ALICE).unwrap();
assert_ok!(Reward::withdraw_reward(&ALICE, Token(INTERBTC)), alice_reward);
let bob_reward = Reward::compute_reward(Token(INTERBTC), &BOB).unwrap();
assert_ok!(Reward::withdraw_reward(&BOB, Token(INTERBTC)), bob_reward);
let alice_reward = Reward::compute_reward(Token(IBTC), &ALICE).unwrap();
assert_ok!(Reward::withdraw_reward(&ALICE, Token(IBTC)), alice_reward);
let bob_reward = Reward::compute_reward(Token(IBTC), &BOB).unwrap();
assert_ok!(Reward::withdraw_reward(&BOB, Token(IBTC)), bob_reward);
})
}
6 changes: 3 additions & 3 deletions crates/staking/src/mock.rs
View file
Expand Up @@ -82,21 +82,21 @@ pub const VAULT: VaultId<AccountId, CurrencyId> = VaultId {
account_id: 1,
currencies: VaultCurrencyPair {
collateral: Token(DOT),
wrapped: Token(INTERBTC),
wrapped: Token(IBTC),
},
};
pub const ALICE: VaultId<AccountId, CurrencyId> = VaultId {
account_id: 2,
currencies: VaultCurrencyPair {
collateral: Token(DOT),
wrapped: Token(INTERBTC),
wrapped: Token(IBTC),
},
};
pub const BOB: VaultId<AccountId, CurrencyId> = VaultId {
account_id: 3,
currencies: VaultCurrencyPair {
collateral: Token(DOT),
wrapped: Token(INTERBTC),
wrapped: Token(IBTC),
},
};

Expand Down

0 comments on commit 6a79dff

Please sign in to comment.