pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 08:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest Substrate master (#863)

Browse Source 
* Begin to update to latest Substrate master

* Fix compilation

* Remove `Balances` from `OnKilledAccount`

* Update cli/src/command.rs

Co-Authored-By: Cecile Tonglet <cecile@parity.io>

* Change gossip name

* Change again

Co-authored-by: Cecile Tonglet <cecile.tonglet@cecton.com>
This commit is contained in:
Bastian Köcher
2020-02-28 12:32:16 +01:00
committed by GitHub
parent 1401eeba3f
commit 8a38b7af3c
15 changed files with 1253 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/common/src/claims.rs
+6 -6
View File
@@ -324,7 +324,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u64>;
type OnNewAccount = ();
type OnReapAccount = Balances;
type OnKilledAccount = Balances;
}
parameter_types! {
@@ -421,7 +421,7 @@ mod tests {
assert_eq!(Balances::free_balance(42), 0);
assert_ok!(Claims::claim(Origin::NONE, 42, sig(&alice(), &42u64.encode())));
assert_eq!(Balances::free_balance(&42), 100);
assert_eq!(Vesting::vesting_balance(&42), 50);
assert_eq!(Vesting::vesting_balance(&42), Some(50));
assert_eq!(Claims::total(), 0);
});
}
@@ -436,13 +436,13 @@ mod tests {
assert_eq!(Balances::free_balance(42), 0);
assert_noop!(
Claims::claim(Origin::NONE, 69, sig(&bob(), &69u64.encode())),
Error::<Test>::SignerHasNoClaim
Error::<Test>::SignerHasNoClaim,
);
assert_ok!(Claims::mint_claim(Origin::ROOT, eth(&bob()), 200, None));
assert_eq!(Claims::total(), 300);
assert_ok!(Claims::claim(Origin::NONE, 69, sig(&bob(), &69u64.encode())));
assert_eq!(Balances::free_balance(&69), 200);
assert_eq!(Vesting::vesting_balance(&69), 0);
assert_eq!(Vesting::vesting_balance(&69), None);
assert_eq!(Claims::total(), 100);
});
}
@@ -462,7 +462,7 @@ mod tests {
assert_ok!(Claims::mint_claim(Origin::ROOT, eth(&bob()), 200, Some((50, 10, 1))));
assert_ok!(Claims::claim(Origin::NONE, 69, sig(&bob(), &69u64.encode())));
assert_eq!(Balances::free_balance(&69), 200);
assert_eq!(Vesting::vesting_balance(&69), 50);
assert_eq!(Vesting::vesting_balance(&69), Some(50));
});
}
@@ -509,7 +509,7 @@ mod tests {
// Everything should be unchanged
assert_eq!(Claims::total(), 300);
assert_eq!(Balances::free_balance(69), 1000);
assert_eq!(Vesting::vesting_balance(&69), 1000);
assert_eq!(Vesting::vesting_balance(&69), Some(1000));
});
}
polkadot/runtime/common/src/crowdfund.rs
+1 -1
View File
@@ -616,7 +616,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u64>;
type OnNewAccount = ();
type OnReapAccount = Balances;
type OnKilledAccount = Balances;
}
parameter_types! {
pub const ExistentialDeposit: u64 = 1;
polkadot/runtime/common/src/parachains.rs
+2 -2
View File
@@ -939,7 +939,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u128>;
type OnNewAccount = ();
type OnReapAccount = ();
type OnKilledAccount = ();
}
parameter_types! {
@@ -1118,7 +1118,7 @@ mod tests {
// stashes are the index.
let session_keys: Vec<_> = authority_keys.iter().enumerate()
.map(|(i, _k)| (i as u64, UintAuthorityId(i as u64)))
.map(|(i, _k)| (i as u64, i as u64, UintAuthorityId(i as u64)))
.collect();
let authorities: Vec<_> = authority_keys.iter().map(|k| ValidatorId::from(k.public())).collect();
polkadot/runtime/common/src/registrar.rs
+2 -2
View File
@@ -705,7 +705,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u128>;
type OnNewAccount = ();
type OnReapAccount = Balances;
type OnKilledAccount = Balances;
}
parameter_types! {
@@ -827,7 +827,7 @@ mod tests {
// stashes are the index.
let session_keys: Vec<_> = authority_keys.iter().enumerate()
.map(|(i, _k)| (i as u64, UintAuthorityId(i as u64)))
.map(|(i, _k)| (i as u64, i as u64, UintAuthorityId(i as u64)))
.collect();
let authorities: Vec<_> = authority_keys.iter().map(|k| ValidatorId::from(k.public())).collect();
polkadot/runtime/common/src/slots.rs
+1 -1
View File
@@ -917,7 +917,7 @@ mod tests {
type ModuleToIndex = ();
type AccountData = balances::AccountData<u64>;
type OnNewAccount = ();
type OnReapAccount = Balances;
type OnKilledAccount = Balances;
}
parameter_types! {