difftreelog
fix rust tests
in: master
8 files changed
pallets/collator-selection/Cargo.tomldiffbeforeafterboth--- a/pallets/collator-selection/Cargo.toml
+++ b/pallets/collator-selection/Cargo.toml
@@ -55,9 +55,12 @@
"frame-system/std",
"log/std",
"pallet-authorship/std",
+ 'pallet-aura/std',
+ 'pallet-balances/std',
"pallet-session/std",
"rand/std",
"scale-info/std",
+ "sp-consensus-aura/std",
"sp-runtime/std",
"sp-staking/std",
"sp-std/std",
pallets/collator-selection/src/mock.rsdiffbeforeafterboth--- a/pallets/collator-selection/src/mock.rs
+++ b/pallets/collator-selection/src/mock.rs
@@ -102,6 +102,8 @@
parameter_types! {
pub const ExistentialDeposit: u64 = 5;
pub const MaxReserves: u32 = 50;
+ pub const MaxHolds: u32 = 2;
+ pub const MaxFreezes: u32 = 2;
}
impl pallet_balances::Config for Test {
@@ -114,6 +116,10 @@
type MaxLocks = ();
type MaxReserves = MaxReserves;
type ReserveIdentifier = [u8; 8];
+ type HoldIdentifier = [u8; 16];
+ type FreezeIdentifier = [u8; 16];
+ type MaxHolds = MaxHolds;
+ type MaxFreezes = MaxFreezes;
}
pub struct Author4;
@@ -209,6 +215,7 @@
pub const MaxXcmAllowedLocations: u32 = 16;
pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);
pub const DayRelayBlocks: u32 = 1;
+ pub const LicenceBondIdentifier: [u8; 16] = *b"licenceidentifie";
}
impl pallet_configuration::Config for Test {
@@ -257,6 +264,7 @@
type ValidatorId = <Self as frame_system::Config>::AccountId;
type ValidatorIdOf = IdentityCollator;
type ValidatorRegistration = IsRegistered;
+ type LicenceBondIdentifier = LicenceBondIdentifier;
type WeightInfo = ();
}
@@ -267,7 +275,9 @@
.unwrap();
let invulnerables = vec![1, 2];
- let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100)];
+ let ed = <Test as pallet_balances::Config>::ExistentialDeposit::get();
+
+ let balances = vec![(1, 100), (2, 100), (3, 100), (4, 100), (5, 100), (33, ed)];
let keys = balances
.iter()
.map(|&(i, _)| {
pallets/collator-selection/src/tests.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617// Original license:18// Copyright (C) 2021 Parity Technologies (UK) Ltd.19// SPDX-License-Identifier: Apache-2.02021// Licensed under the Apache License, Version 2.0 (the "License");22// you may not use this file except in compliance with the License.23// You may obtain a copy of the License at24//25// http://www.apache.org/licenses/LICENSE-2.026//27// Unless required by applicable law or agreed to in writing, software28// distributed under the License is distributed on an "AS IS" BASIS,29// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.30// See the License for the specific language governing permissions and31// limitations under the License.3233use crate as collator_selection;34use crate::{mock::*, Error};35use frame_support::{36 assert_noop, assert_ok,37 traits::{Currency, GenesisBuild, OnInitialize},38};39use frame_system::RawOrigin;40use pallet_balances::Error as BalancesError;41use sp_runtime::traits::BadOrigin;42use pallet_configuration::{43 CollatorSelectionDesiredCollatorsOverride as DesiredCollators,44 CollatorSelectionKickThresholdOverride as KickThreshold,45 CollatorSelectionLicenseBondOverride as LicenseBond,46};4748fn get_license_and_onboard(account_id: <Test as frame_system::Config>::AccountId) {49 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(50 account_id51 )));52 assert_ok!(CollatorSelection::onboard(RuntimeOrigin::signed(53 account_id54 )));55}5657#[test]58fn basic_setup_works() {59 new_test_ext().execute_with(|| {60 assert_eq!(<DesiredCollators<Test>>::get(), 5);61 assert_eq!(<LicenseBond<Test>>::get(), 10);6263 assert!(CollatorSelection::candidates().is_empty());64 assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);65 });66}6768#[test]69fn it_should_add_invulnerables() {70 new_test_ext().execute_with(|| {71 assert_ok!(CollatorSelection::add_invulnerable(72 RuntimeOrigin::signed(RootAccount::get()),73 174 ));75 assert_ok!(CollatorSelection::add_invulnerable(76 RuntimeOrigin::signed(RootAccount::get()),77 278 ));79 assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);8081 // cannot set with non-root.82 assert_noop!(83 CollatorSelection::add_invulnerable(RuntimeOrigin::signed(1), 3),84 BadOrigin85 );8687 // cannot set invulnerables without associated validator keys88 assert_noop!(89 CollatorSelection::add_invulnerable(RuntimeOrigin::signed(RootAccount::get()), 7),90 Error::<Test>::ValidatorNotRegistered91 );92 });93}9495#[test]96fn it_should_remove_invulnerables() {97 new_test_ext().execute_with(|| {98 assert_ok!(CollatorSelection::add_invulnerable(99 RuntimeOrigin::signed(RootAccount::get()),100 1101 ));102 assert_ok!(CollatorSelection::add_invulnerable(103 RuntimeOrigin::signed(RootAccount::get()),104 2105 ));106107 // cannot remove with non-root.108 assert_noop!(109 CollatorSelection::remove_invulnerable(RuntimeOrigin::signed(1), 3),110 BadOrigin111 );112113 assert_ok!(CollatorSelection::remove_invulnerable(114 RuntimeOrigin::signed(RootAccount::get()),115 2116 ));117 assert_eq!(CollatorSelection::invulnerables(), vec![1]);118119 // cannot remove an invulnerable if there would be 0 invulnerables.120 assert_noop!(121 CollatorSelection::remove_invulnerable(RuntimeOrigin::signed(RootAccount::get()), 1),122 Error::<Test>::TooFewInvulnerables123 );124 });125}126127#[test]128fn set_desired_collators_works() {129 new_test_ext().execute_with(|| {130 // given131 assert_eq!(<DesiredCollators<Test>>::get(), 5);132133 // can set134 assert_ok!(Configuration::set_collator_selection_desired_collators(135 RawOrigin::Root.into(),136 Some(7)137 ));138 assert_eq!(<DesiredCollators<Test>>::get(), 7);139140 // rejects bad origin141 assert_noop!(142 Configuration::set_collator_selection_desired_collators(143 RuntimeOrigin::signed(1),144 Some(8)145 ),146 BadOrigin147 );148 });149}150151#[test]152fn set_license_bond() {153 new_test_ext().execute_with(|| {154 // given155 assert_eq!(<LicenseBond<Test>>::get(), 10);156157 // can set158 assert_ok!(Configuration::set_collator_selection_license_bond(159 RawOrigin::Root.into(),160 Some(7)161 ));162 assert_eq!(<LicenseBond<Test>>::get(), 7);163164 // rejects bad origin.165 assert_noop!(166 Configuration::set_collator_selection_license_bond(RuntimeOrigin::signed(1), Some(8)),167 BadOrigin168 );169 });170}171172#[test]173fn cannot_onboard_candidate_with_no_license() {174 new_test_ext().execute_with(|| {175 // can't onboard a candidate who did not get a license.176 assert_noop!(177 CollatorSelection::onboard(RuntimeOrigin::signed(3)),178 Error::<Test>::NoLicense,179 );180181 // but give it a license and welcome aboard.182 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));183 assert_ok!(CollatorSelection::onboard(RuntimeOrigin::signed(3)));184 })185}186187#[test]188fn cannot_onboard_candidate_if_too_many() {189 new_test_ext().execute_with(|| {190 // reset desired candidates191 <pallet_configuration::CollatorSelectionDesiredCollatorsOverride<Test>>::put(0);192193 // can still get a license.194 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(4)));195196 // can't accept anyone anymore.197 assert_noop!(198 CollatorSelection::onboard(RuntimeOrigin::signed(4)),199 Error::<Test>::TooManyCandidates,200 );201202 // reset desired candidates to invulnerables + 1203 <pallet_configuration::CollatorSelectionDesiredCollatorsOverride<Test>>::put(3);204 assert_ok!(CollatorSelection::onboard(RuntimeOrigin::signed(4)));205206 // but no more.207 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(5)));208 assert_noop!(209 CollatorSelection::onboard(RuntimeOrigin::signed(5)),210 Error::<Test>::TooManyCandidates,211 );212 })213}214215#[test]216fn cannot_obtain_license_if_keys_not_registered() {217 new_test_ext().execute_with(|| {218 // can't 7 because keys not registered.219 assert_noop!(220 CollatorSelection::get_license(RuntimeOrigin::signed(7)),221 Error::<Test>::ValidatorNotRegistered222 );223 })224}225226#[test]227fn cannot_obtain_license_if_poor() {228 new_test_ext().execute_with(|| {229 assert_eq!(Balances::free_balance(&3), 100);230 assert_eq!(Balances::free_balance(&33), 0);231232 // works233 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));234235 // poor236 assert_noop!(237 CollatorSelection::get_license(RuntimeOrigin::signed(33)),238 BalancesError::<Test>::InsufficientBalance,239 );240 });241}242243#[test]244fn cannot_onboard_dupe_candidate() {245 new_test_ext().execute_with(|| {246 // can add 3 as candidate247 get_license_and_onboard(3);248 assert_eq!(CollatorSelection::license_deposit_of(3), 10);249 assert_eq!(CollatorSelection::candidates(), vec![3]);250 assert_eq!(CollatorSelection::last_authored_block(3), 10);251 assert_eq!(Balances::free_balance(3), 90);252253 // but no more254 assert_noop!(255 CollatorSelection::get_license(RuntimeOrigin::signed(3)),256 Error::<Test>::AlreadyHoldingLicense,257 );258 assert_noop!(259 CollatorSelection::onboard(RuntimeOrigin::signed(3)),260 Error::<Test>::AlreadyCandidate,261 );262 })263}264265#[test]266fn becoming_candidate_works() {267 new_test_ext().execute_with(|| {268 // given269 assert_eq!(<DesiredCollators<Test>>::get(), 5);270 assert_eq!(<LicenseBond<Test>>::get(), 10);271 assert_eq!(CollatorSelection::candidates(), Vec::new());272 assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);273274 // take two endowed, non-invulnerables accounts.275 assert_eq!(Balances::free_balance(&3), 100);276 assert_eq!(Balances::free_balance(&4), 100);277278 get_license_and_onboard(3);279 get_license_and_onboard(4);280281 assert_eq!(Balances::free_balance(&3), 90);282 assert_eq!(Balances::free_balance(&4), 90);283284 assert_eq!(CollatorSelection::candidates().len(), 2);285 });286}287288#[test]289fn cannot_become_candidate_if_invulnerable() {290 new_test_ext().execute_with(|| {291 assert_eq!(CollatorSelection::invulnerables(), vec![1, 2]);292293 // can obtain a license even if is invulnerable.294 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(1)));295 // but cannot onboard296 assert_noop!(297 CollatorSelection::onboard(RuntimeOrigin::signed(1)),298 Error::<Test>::AlreadyInvulnerable,299 );300301 // get a license and then become invulnerable.302 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));303 assert_ok!(CollatorSelection::add_invulnerable(304 RuntimeOrigin::signed(RootAccount::get()),305 3306 ));307 assert_noop!(308 CollatorSelection::onboard(RuntimeOrigin::signed(3)),309 Error::<Test>::AlreadyInvulnerable,310 );311 })312}313314#[test]315fn can_become_invulnerable_if_candidate() {316 new_test_ext().execute_with(|| {317 // become a candidate and then become invulnerable.318 get_license_and_onboard(3);319 assert_eq!(CollatorSelection::candidates(), vec![3]);320321 assert_ok!(CollatorSelection::add_invulnerable(322 RuntimeOrigin::signed(RootAccount::get()),323 3324 ));325 // should exclude from candidates, but not revoke the license326 assert_eq!(CollatorSelection::candidates(), vec![]);327 assert_eq!(CollatorSelection::license_deposit_of(3), 10);328 assert_eq!(Balances::free_balance(3), 90);329 });330}331332#[test]333fn offboard() {334 new_test_ext().execute_with(|| {335 // register a candidate.336 get_license_and_onboard(3);337 assert_eq!(Balances::free_balance(3), 90);338339 // cannot leave if holds license but not yet candidate.340 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(4)));341 assert_noop!(342 CollatorSelection::offboard(RuntimeOrigin::signed(4)),343 Error::<Test>::NotCandidate344 );345 // cannot leave if does not hold license.346 assert_noop!(347 CollatorSelection::offboard(RuntimeOrigin::signed(5)),348 Error::<Test>::NotCandidate349 );350351 // bond is returned - only after releasing the license352 assert_ok!(CollatorSelection::offboard(RuntimeOrigin::signed(3)));353 assert_eq!(Balances::free_balance(3), 90);354 assert_eq!(CollatorSelection::last_authored_block(3), 0);355 assert_ok!(CollatorSelection::release_license(RuntimeOrigin::signed(3)));356 assert_eq!(Balances::free_balance(3), 100);357 });358}359360#[test]361fn release_license() {362 new_test_ext().execute_with(|| {363 // obtain a license to collate and reserve the bond.364 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));365 assert_eq!(Balances::free_balance(3), 90);366367 // release the license and get the bond back.368 assert_ok!(CollatorSelection::release_license(RuntimeOrigin::signed(3)));369 assert_eq!(Balances::free_balance(3), 100);370371 // register a candidate.372 get_license_and_onboard(3);373 assert_eq!(Balances::free_balance(3), 90);374375 // can release license even if onboarded.376 assert_ok!(CollatorSelection::release_license(RuntimeOrigin::signed(3)));377 assert_eq!(Balances::free_balance(3), 100);378 assert_eq!(CollatorSelection::candidates(), vec![]);379 });380}381382#[test]383fn force_release_license() {384 new_test_ext().execute_with(|| {385 // obtain a license to collate and reserve the bond.386 assert_ok!(CollatorSelection::get_license(RuntimeOrigin::signed(3)));387 assert_eq!(Balances::free_balance(3), 90);388389 // cannot execute the operation as non-root390 assert_noop!(391 CollatorSelection::force_release_license(RuntimeOrigin::signed(3), 3),392 BadOrigin393 );394395 // release the license and get the bond back.396 assert_ok!(CollatorSelection::force_release_license(397 RuntimeOrigin::signed(RootAccount::get()),398 3399 ));400 assert_eq!(Balances::free_balance(3), 100);401402 // register a candidate.403 get_license_and_onboard(3);404 assert_eq!(Balances::free_balance(3), 90);405406 // can release license even if onboarded.407 assert_ok!(CollatorSelection::force_release_license(408 RuntimeOrigin::signed(RootAccount::get()),409 3410 ));411 assert_eq!(Balances::free_balance(3), 100);412 assert_eq!(CollatorSelection::candidates(), vec![]);413 });414}415416#[test]417fn authorship_event_handler() {418 new_test_ext().execute_with(|| {419 // put 100 in the pot + 5 for ED420 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::set_balance(421 &CollatorSelection::account_id(),422 105,423 );424425 // 4 is the default author.426 assert_eq!(Balances::free_balance(4), 100);427 get_license_and_onboard(4);428 // triggers `note_author`429 Authorship::on_initialize(1);430431 assert_eq!(CollatorSelection::candidates(), vec![4]);432 assert_eq!(CollatorSelection::last_authored_block(4), 0);433434 // half of the pot goes to the collator who's the author (4 in tests).435 assert_eq!(Balances::free_balance(4), 140);436 // half + ED stays.437 assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 55);438 });439}440441#[test]442fn fees_edgecases() {443 new_test_ext().execute_with(|| {444 // Nothing panics, no reward when no ED in balance445 Authorship::on_initialize(1);446 // put some money into the pot at ED447 <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::set_balance(448 &CollatorSelection::account_id(),449 5,450 );451 // 4 is the default author.452 assert_eq!(Balances::free_balance(4), 100);453 get_license_and_onboard(4);454 // triggers `note_author`455 Authorship::on_initialize(1);456457 assert_eq!(CollatorSelection::candidates(), vec![4]);458 assert_eq!(CollatorSelection::last_authored_block(4), 0);459 // Nothing received460 assert_eq!(Balances::free_balance(4), 90);461 // all fee stays462 assert_eq!(Balances::free_balance(CollatorSelection::account_id()), 5);463 });464}465466#[test]467fn session_management_works() {468 new_test_ext().execute_with(|| {469 initialize_to_block(1);470471 assert_eq!(SessionChangeBlock::get(), 0);472 assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);473474 initialize_to_block(4);475476 assert_eq!(SessionChangeBlock::get(), 0);477 assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);478479 // add a new collator480 get_license_and_onboard(5);481482 // session won't see this.483 assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);484 // but we have a new candidate.485 assert_eq!(CollatorSelection::candidates().len(), 1);486487 initialize_to_block(10);488 assert_eq!(SessionChangeBlock::get(), 10);489 // pallet-session has 1 session delay; current validators are the same.490 assert_eq!(Session::validators(), vec![1, 2]);491 // queued ones are changed, and now we have 3.492 assert_eq!(Session::queued_keys().len(), 3);493 // session handlers (aura, et. al.) cannot see this yet.494 assert_eq!(SessionHandlerCollators::get(), vec![1, 2]);495496 initialize_to_block(20);497 assert_eq!(SessionChangeBlock::get(), 20);498 // changed are now reflected to session handlers.499 assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 5]);500 });501}502503#[test]504fn kick_mechanism() {505 new_test_ext().execute_with(|| {506 // add a new collator507 get_license_and_onboard(3);508 get_license_and_onboard(4);509510 initialize_to_block(10);511 assert_eq!(CollatorSelection::candidates().len(), 2);512513 initialize_to_block(20);514 assert_eq!(SessionChangeBlock::get(), 20);515 // 4 authored this block, gets to stay 3 was kicked516 assert_eq!(CollatorSelection::candidates().len(), 1);517 // 3 will be kicked after 1 session delay518 assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 3, 4]);519520 assert_eq!(CollatorSelection::candidates(), vec![4]);521 assert_eq!(<KickThreshold<Test>>::get(), 10);522 assert_eq!(CollatorSelection::last_authored_block(4), 20);523524 initialize_to_block(30);525 // 3 gets kicked after 1 session delay526 assert_eq!(SessionHandlerCollators::get(), vec![1, 2, 4]);527 // kicked collator gets their funds slashed, the deposit going to treasury528 assert_eq!(Balances::free_balance(3), 90);529 });530}531532#[test]533#[should_panic = "duplicate invulnerables in genesis."]534fn cannot_set_genesis_value_twice() {535 sp_tracing::try_init_simple();536 let mut t = frame_system::GenesisConfig::default()537 .build_storage::<Test>()538 .unwrap();539 let invulnerables = vec![1, 1];540541 let collator_selection = collator_selection::GenesisConfig::<Test> { invulnerables };542 // collator selection must be initialized before session.543 collator_selection.assimilate_storage(&mut t).unwrap();544}pallets/foreign-assets/Cargo.tomldiffbeforeafterboth--- a/pallets/foreign-assets/Cargo.toml
+++ b/pallets/foreign-assets/Cargo.toml
@@ -42,5 +42,6 @@
"sp-runtime/std",
"sp-std/std",
"up-data-structs/std",
+ "xcm-executor/std"
]
try-runtime = ["frame-support/try-runtime"]
pallets/identity/Cargo.tomldiffbeforeafterboth--- a/pallets/identity/Cargo.toml
+++ b/pallets/identity/Cargo.toml
@@ -46,5 +46,6 @@
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
+ "pallet-balances/std",
]
try-runtime = ["frame-support/try-runtime"]
pallets/identity/src/tests.rsdiffbeforeafterboth--- a/pallets/identity/src/tests.rs
+++ b/pallets/identity/src/tests.rs
@@ -106,6 +106,10 @@
type MaxReserves = ();
type ReserveIdentifier = [u8; 8];
type WeightInfo = ();
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
pallets/inflation/src/lib.rsdiffbeforeafterboth--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -187,12 +187,11 @@
<NextInflationBlock<T>>::set(inflation_start_relay_block + block_interval.into());
// First time deposit - create Treasury account so that we can call deposit_into_existing everywhere else
- let imbalance = T::Currency::deposit(
+ let _ = T::Currency::deposit(
&T::TreasuryAccountId::get(),
<BlockInflation<T>>::get(),
Precision::Exact,
)?;
- debug_assert!(imbalance.peek().is_zero());
}
Ok(())
pallets/inflation/src/tests.rsdiffbeforeafterboth--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -20,7 +20,7 @@
use frame_support::{
assert_ok, parameter_types,
- traits::{Currency, OnInitialize, Everything, ConstU32},
+ traits::{fungible::{Balanced, Inspect}, OnInitialize, Everything, ConstU32, tokens::Precision},
weights::Weight,
};
use frame_system::RawOrigin;
@@ -53,6 +53,10 @@
type MaxLocks = MaxLocks;
type MaxReserves = ();
type ReserveIdentifier = ();
+ type HoldIdentifier = ();
+ type FreezeIdentifier = ();
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
frame_support::construct_runtime!(
@@ -141,7 +145,7 @@
fn uninitialized_inflation() {
new_test_ext().execute_with(|| {
let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
// BlockInflation should be set after inflation is started
@@ -157,7 +161,7 @@
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
// BlockInflation should be set after inflation is started
@@ -187,7 +191,7 @@
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(1);
@@ -218,7 +222,7 @@
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(1);
@@ -234,7 +238,7 @@
}
assert_eq!(
initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
- <Balances as Currency<_>>::total_issuance()
+ <Balances as Inspect<_>>::total_issuance()
);
MockBlockNumberProvider::set(YEAR + 1);
@@ -254,7 +258,7 @@
// Total issuance = 1_000_000_000
let initial_issuance: u64 = 1_000_000_000;
let start_block: u64 = 10457457;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(start_block);
@@ -273,7 +277,7 @@
}
assert_eq!(
initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
- <Balances as Currency<_>>::total_issuance()
+ <Balances as Inspect<_>>::total_issuance()
);
MockBlockNumberProvider::set(start_block + YEAR + 1);
@@ -292,7 +296,7 @@
new_test_ext().execute_with(|| {
// Total issuance = 1_000_000_000
let initial_issuance: u64 = 1_000_000_000;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
MockBlockNumberProvider::set(YEAR * 9 + 1);
@@ -327,7 +331,7 @@
// For accuracy total issuance = payout0 * payouts * 10;
let initial_issuance: u64 = payout_by_year[0] * payouts * 10;
- let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
+ let _ = <Balances as Balanced<_>>::deposit(&1234, initial_issuance, Precision::Exact);
assert_eq!(Balances::free_balance(1234), initial_issuance);
// Start inflation as sudo