pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 10:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes for substrate#3699 (#466)

Browse Source 
* change upstream and branch

* Fix build

* remove doc renamings

* Fix tests

* .

* Revert changing fork and branch

* Update Cargo.toml

* Update parachains.rs
This commit is contained in:
Ashley
2019-10-11 00:50:41 +13:00
committed by Bastian Köcher
parent ecfea4536f
commit 9240042048
5 changed files with 102 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/runtime/src/lib.rs
+2 -1
View File
@@ -521,6 +521,7 @@ construct_runtime!(
{
// Basic stuff; balances is uncallable initially.
System: system::{Module, Call, Storage, Config, Event},
RandomnessCollectiveFlip: randomness_collective_flip::{Module, Storage},
// Must be before session.
Babe: babe::{Module, Call, Storage, Config, Inherent(Timestamp)},
@@ -629,7 +630,7 @@ impl_runtime_apis! {
}
fn random_seed() -> <Block as BlockT>::Hash {
System::random_seed()
RandomnessCollectiveFlip::random_seed()
}
}
polkadot/runtime/src/parachains.rs
+8 -5
View File
@@ -538,7 +538,7 @@ impl<T: Trait> Module<T> {
let mut seed = {
let phrase = b"validator_role_pairs";
let seed = system::Module::<T>::random(&phrase[..]);
let seed = randomness_collective_flip::Module::<T>::random(&phrase[..]);
let seed_len = seed.as_ref().len();
let needed_bytes = validator_count * 4;
@@ -887,7 +887,7 @@ mod tests {
use substrate_trie::NodeCodec;
use sr_primitives::{
Perbill,
traits::{BlakeTwo256, IdentityLookup, ConvertInto},
traits::{BlakeTwo256, IdentityLookup, ConvertInto, OnInitialize},
testing::{UintAuthorityId, Header},
curve::PiecewiseLinear,
};
@@ -1056,6 +1056,7 @@ mod tests {
type Parachains = Module<Test>;
type System = system::Module<Test>;
type RandomnessCollectiveFlip = randomness_collective_flip::Module<Test>;
fn new_test_ext(parachains: Vec<(ParaId, Vec<u8>, Vec<u8>)>) -> TestExternalities<Blake2Hasher> {
use staking::StakerStatus;
@@ -1540,16 +1541,18 @@ mod tests {
check_roster(&duty_roster_0);
System::initialize(&1, &H256::from([1; 32]), &Default::default(), &Default::default());
RandomnessCollectiveFlip::on_initialize(1);
let duty_roster_1 = Parachains::calculate_duty_roster().0;
check_roster(&duty_roster_1);
assert!(duty_roster_0 != duty_roster_1);
assert_ne!(duty_roster_0, duty_roster_1);
System::initialize(&2, &H256::from([2; 32]), &Default::default(), &Default::default());
RandomnessCollectiveFlip::on_initialize(2);
let duty_roster_2 = Parachains::calculate_duty_roster().0;
check_roster(&duty_roster_2);
assert!(duty_roster_0 != duty_roster_2);
assert!(duty_roster_1 != duty_roster_2);
assert_ne!(duty_roster_0, duty_roster_2);
assert_ne!(duty_roster_1, duty_roster_2);
});
}
polkadot/runtime/src/slots.rs
+1 -1
View File
@@ -437,7 +437,7 @@ impl<T: Trait> Module<T> {
if early_end + T::EndingPeriod::get() == now {
// Just ended!
let ending_period = T::EndingPeriod::get();
let offset = T::BlockNumber::decode(&mut<system::Module<T>>::random_seed().as_ref())
let offset = T::BlockNumber::decode(&mut<randomness_collective_flip::Module<T>>::random_seed().as_ref())
.expect("secure hashes always bigger than block numbers; qed") % ending_period;
let res = <Winning<T>>::get(offset).unwrap_or_default();
let mut i = T::BlockNumber::zero();