Merge branch 'master' into child_trie_w3_change

Author: cheme

.gitlab-ci.yml

@@ -38,7 +38,7 @@ variables:
   DOCKER_OS:                       "debian:stretch"
   ARCH:                            "x86_64"
   # FIXME set to release
-  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.8"
+  CARGO_UNLEASH_INSTALL_PARAMS:    "--version 1.0.0-alpha.10"
   CARGO_UNLEASH_PKG_DEF:           "--skip node node-* pallet-template pallet-example pallet-example-* subkey chain-spec-builder"
 
 
@@ -214,6 +214,24 @@ test-frame-staking:
     - WASM_BUILD_NO_COLOR=1 time cargo test --release --verbose --no-default-features --features std
     - sccache -s
 
+test-frame-examples-compile-to-wasm:
+  stage:                           test
+  <<:                              *docker-env
+  variables:
+    # Enable debug assertions since we are running optimized builds for testing
+    # but still want to have debug assertions.
+    RUSTFLAGS: -Cdebug-assertions=y
+    RUST_BACKTRACE: 1
+  except:
+    variables:
+      - $DEPLOY_TAG
+  script:
+    - cd frame/example-offchain-worker/
+    - cargo +nightly build --target=wasm32-unknown-unknown --no-default-features
+    - cd ../example
+    - cargo +nightly build --target=wasm32-unknown-unknown --no-default-features
+    - sccache -s
+
 test-wasmtime:
   stage:                           test
   <<:                              *docker-env
@@ -578,7 +596,7 @@ publish-to-crates-io:
   <<:                              *docker-env
   only:
     - tags
-    - ci-release
+    - /^ci-release-.*$/
   script:
     - cargo install cargo-unleash ${CARGO_UNLEASH_INSTALL_PARAMS}
     - cargo unleash em-dragons --no-check ${CARGO_UNLEASH_PKG_DEF}

Cargo.lock

@@ -40,7 +40,7 @@ impl system::Trait for Test {
 	type Version = ();
 	type ModuleToIndex = ();
 	type AccountData = ();
-	type MigrateAccount = (); type OnNewAccount = ();
+	type OnNewAccount = ();
 	type OnKilledAccount = ();
 }
 impl Trait for Test {

bin/node-template/pallets/template/src/mock.rs

@@ -162,7 +162,7 @@ impl system::Trait for Runtime {
 	/// This type is being generated by `construct_runtime!`.
 	type ModuleToIndex = ModuleToIndex;
 	/// What to do if a new account is created.
-	type MigrateAccount = (); type OnNewAccount = ();
+	type OnNewAccount = ();
 	/// What to do if an account is fully reaped from the system.
 	type OnKilledAccount = ();
 	/// The data to be stored in an account.

bin/node-template/runtime/src/lib.rs

@@ -60,8 +60,8 @@ pallet-randomness-collective-flip = { version = "2.0.0-alpha.4", default-feature
 pallet-recovery = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/recovery" }
 pallet-session = { version = "2.0.0-alpha.4", features = ["historical"], path = "../../../frame/session", default-features = false }
 pallet-session-benchmarking = { version = "2.0.0-alpha.4", path = "../../../frame/session/benchmarking", default-features = false, optional = true }
-pallet-staking = { version = "2.0.0-alpha.4", features = ["migrate"], path = "../../../frame/staking", default-features = false }
-pallet-staking-reward-curve = { version = "2.0.0-alpha.4",  path = "../../../frame/staking/reward-curve" }
+pallet-staking = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/staking" }
+pallet-staking-reward-curve = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/staking/reward-curve" }
 pallet-sudo = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/sudo" }
 pallet-society = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/society" }
 pallet-timestamp = { version = "2.0.0-alpha.4", default-features = false, path = "../../../frame/timestamp" }
@@ -135,10 +135,16 @@ std = [
 ]
 runtime-benchmarks = [
 	"frame-benchmarking",
+	"frame-support/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-identity/runtime-benchmarks",
-	"pallet-session-benchmarking",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
+	"pallet-session-benchmarking",
+	"pallet-staking/runtime-benchmarks",
 	"pallet-vesting/runtime-benchmarks",
+	"pallet-session-benchmarking",
 	"pallet-staking/runtime-benchmarks",
+	"pallet-im-online/runtime-benchmarks",
 ]