Merge branch 'master' of github.com:paritytech/substrate

paritytech · Dec 10, 2019 · dc85fa5 · dc85fa5
2 parents 8e4448c + 36a704b
commit dc85fa5
Show file tree

Hide file tree

Showing 245 changed files with 2,958 additions and 927 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -367,7 +367,7 @@ check_polkadot:
     - mkdir -p target/debug/wbuild/.cargo
     - echo "paths = [ \"$SUBSTRATE_PATH\" ]" > target/debug/wbuild/.cargo/config
     # package, others are updated along the way.
-    - cargo update -p sp-io
+    - cargo update
     # Check whether Polkadot 'master' branch builds with this Substrate commit.
     - time cargo check
     - cd -

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -63,6 +63,7 @@ members = [
 	"frame/finality-tracker",
 	"frame/generic-asset",
 	"frame/grandpa",
+	"frame/identity",
 	"frame/im-online",
 	"frame/indices",
 	"frame/membership",
@@ -122,7 +123,7 @@ members = [
 	"primitives/runtime",
 	"primitives/sr-sandbox",
 	"primitives/sr-staking-primitives",
-	"primitives/sr-std",
+	"primitives/std",
 	"primitives/sr-version",
 	"primitives/state-machine",
 	"primitives/timestamp",

diff --git a/bin/node-template/runtime/Cargo.toml b/bin/node-template/runtime/Cargo.toml
@@ -17,7 +17,7 @@ inherents = { package = "sp-inherents", path = "../../../primitives/inherents",
 offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false }
 primitives = { package = "sp-core", path = "../../../primitives/core", default-features = false }
 randomness-collective-flip = { package = "pallet-randomness-collective-flip", path = "../../../frame/randomness-collective-flip", default-features = false }
-rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 runtime-io = { package = "sp-io", path = "../../../primitives/sr-io", default-features = false }
 safe-mix = { version = "1.0.0", default-features = false }
 serde = { version = "1.0.101", optional = true, features = ["derive"] }
@@ -50,7 +50,7 @@ std = [
 	"offchain-primitives/std",
 	"primitives/std",
 	"randomness-collective-flip/std",
-	"rstd/std",
+	"sp-std/std",
 	"runtime-io/std",
 	"safe-mix/std",
 	"serde",

diff --git a/bin/node-template/runtime/src/lib.rs b/bin/node-template/runtime/src/lib.rs
@@ -8,7 +8,7 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
-use rstd::prelude::*;
+use sp_std::prelude::*;
 use primitives::OpaqueMetadata;
 use sp_runtime::{
 	ApplyExtrinsicResult, transaction_validity::TransactionValidity, generic, create_runtime_str,

diff --git a/bin/node/cli/src/chain_spec.rs b/bin/node/cli/src/chain_spec.rs
@@ -219,6 +219,7 @@ pub fn testnet_genesis(
 			get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 		]
 	});
+	let num_endowed_accounts = endowed_accounts.len();
 
 	const ENDOWMENT: Balance = 10_000_000 * DOLLARS;
 	const STASH: Balance = 100 * DOLLARS;
@@ -259,12 +260,12 @@ pub fn testnet_genesis(
 		democracy: Some(DemocracyConfig::default()),
 		collective_Instance1: Some(CouncilConfig {
 			members: endowed_accounts.iter().cloned()
-				.collect::<Vec<_>>()[..5].to_vec(),
+				.collect::<Vec<_>>()[..(num_endowed_accounts + 1) / 2].to_vec(),
 			phantom: Default::default(),
 		}),
 		collective_Instance2: Some(TechnicalCommitteeConfig {
 			members: endowed_accounts.iter().cloned()
-				.collect::<Vec<_>>()[..5].to_vec(),
+				.collect::<Vec<_>>()[..(num_endowed_accounts + 1) / 2].to_vec(),
 			phantom: Default::default(),
 		}),
 		contracts: Some(ContractsConfig {

diff --git a/bin/node/runtime/Cargo.toml b/bin/node/runtime/Cargo.toml
@@ -21,7 +21,7 @@ inherents = { package = "sp-inherents", path = "../../../primitives/inherents",
 node-primitives = { path = "../primitives", default-features = false }
 offchain-primitives = { package = "sp-offchain", path = "../../../primitives/offchain", default-features = false }
 primitives = { package = "sp-core",  path = "../../../primitives/core", default-features = false }
-rstd = { package = "sp-std", path = "../../../primitives/sr-std", default-features = false }
+sp-std = { path = "../../../primitives/std", default-features = false }
 sp-api = { path = "../../../primitives/sr-api", default-features = false }
 sp-runtime = { path = "../../../primitives/runtime", default-features = false }
 sp-staking = { path = "../../../primitives/sr-staking-primitives", default-features = false }
@@ -97,7 +97,7 @@ std = [
 	"offences/std",
 	"primitives/std",
 	"randomness-collective-flip/std",
-	"rstd/std",
+	"sp-std/std",
 	"rustc-hex",
 	"safe-mix/std",
 	"serde",

diff --git a/bin/node/runtime/src/impls.rs b/bin/node/runtime/src/impls.rs
@@ -47,7 +47,7 @@ impl Convert<u128, Balance> for CurrencyToVoteHandler {
 
 /// Convert from weight to balance via a simple coefficient multiplication
 /// The associated type C encapsulates a constant in units of balance per weight
-pub struct LinearWeightToFee<C>(rstd::marker::PhantomData<C>);
+pub struct LinearWeightToFee<C>(sp_std::marker::PhantomData<C>);
 
 impl<C: Get<Balance>> Convert<Weight, Balance> for LinearWeightToFee<C> {
 	fn convert(w: Weight) -> Balance {
@@ -66,7 +66,7 @@ impl<C: Get<Balance>> Convert<Weight, Balance> for LinearWeightToFee<C> {
 ///
 /// Where `target_weight` must be given as the `Get` implementation of the `T` generic type.
 /// https://research.web3.foundation/en/latest/polkadot/Token%20Economics/#relay-chain-transaction-fees
-pub struct TargetedFeeAdjustment<T>(rstd::marker::PhantomData<T>);
+pub struct TargetedFeeAdjustment<T>(sp_std::marker::PhantomData<T>);
 
 impl<T: Get<Perbill>> Convert<Fixed64, Fixed64> for TargetedFeeAdjustment<T> {
 	fn convert(multiplier: Fixed64) -> Fixed64 {