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

Author: codekitz

frame/balances/src/lib.rs

@@ -782,8 +782,8 @@ pub mod pallet {
 			}
 			a.flags.set_new_logic();
 			if !a.reserved.is_zero() || !a.frozen.is_zero() {
-				if !system::Pallet::<T>::can_inc_consumer(who) {
-					// Gah!! We have a non-zero reserve balance but no provider refs :(
+				if system::Pallet::<T>::providers(who) == 0 {
+					// Gah!! We have no provider refs :(
 					// This shouldn't practically happen, but we need a failsafe anyway: let's give
 					// them enough for an ED.
 					log::warn!(
@@ -794,7 +794,7 @@ pub mod pallet {
 					a.free = a.free.max(Self::ed());
 					system::Pallet::<T>::inc_providers(who);
 				}
-				let _ = system::Pallet::<T>::inc_consumers(who).defensive();
+				let _ = system::Pallet::<T>::inc_consumers_without_limit(who).defensive();
 			}
 			// Should never fail - we're only setting a bit.
 			let _ = T::AccountStore::try_mutate_exists(who, |account| -> DispatchResult {

scripts/ci/gitlab/pipeline/build.yml

@@ -148,7 +148,6 @@ build-rustdoc:
   variables:
     SKIP_WASM_BUILD: 1
     DOC_INDEX_PAGE: "sc_service/index.html" # default redirected page
-    RUSTY_CACHIER_TOOLCHAIN: nightly
     # this variable gets overriden by "rusty-cachier environment inject", use the value as default
     CARGO_TARGET_DIR: "$CI_PROJECT_DIR/target"
   artifacts:
@@ -163,7 +162,7 @@ build-rustdoc:
       artifacts: false
   script:
     - rusty-cachier snapshot create
-    - time cargo +nightly doc --locked --workspace --all-features --verbose --no-deps
+    - time cargo doc --locked --workspace --all-features --verbose --no-deps
     - rm -f $CARGO_TARGET_DIR/doc/.lock
     - mv $CARGO_TARGET_DIR/doc ./crate-docs
     # FIXME: remove me after CI image gets nonroot

scripts/ci/gitlab/pipeline/test.yml

@@ -61,21 +61,17 @@ cargo-clippy:
   needs:
     - job: cargo-fmt
       artifacts: false
-  variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
   extends:
     - .docker-env
     - .test-refs
   script:
     - rusty-cachier snapshot create
-    - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
+    - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo clippy --all-targets
     - rusty-cachier cache upload
 
 cargo-check-benches:
   stage: test
   variables:
-    # Override to use nightly toolchain
-    RUSTY_CACHIER_TOOLCHAIN: "nightly"
     CI_JOB_NAME: "cargo-check-benches"
   extends:
     - .docker-env
@@ -105,7 +101,7 @@ cargo-check-benches:
     - echo "___Running benchmarks___";
     - case ${CI_NODE_INDEX} in
       1)
-      SKIP_WASM_BUILD=1 time cargo +nightly check --locked --benches --all;
+      SKIP_WASM_BUILD=1 time cargo check --locked --benches --all;
       cargo run --locked --release -p node-bench -- ::trie::read::small --json
       | tee ./artifacts/benches/$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA/::trie::read::small.json;
       echo "___Uploading cache for rusty-cachier___";
@@ -301,17 +297,16 @@ test-frame-examples-compile-to-wasm:
     - .docker-env
     - .test-refs
   variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-C debug-assertions"
     RUST_BACKTRACE: 1
   script:
     - rusty-cachier snapshot create
     - cd ./frame/examples/offchain-worker/
-    - cargo +nightly build --locked --target=wasm32-unknown-unknown --no-default-features
+    - cargo build --locked --target=wasm32-unknown-unknown --no-default-features
     - cd ../basic
-    - cargo +nightly build --locked --target=wasm32-unknown-unknown --no-default-features
+    - cargo build --locked --target=wasm32-unknown-unknown --no-default-features
     - rusty-cachier cache upload
 
 test-linux-stable-int:
@@ -344,17 +339,15 @@ check-tracing:
   needs:
     - job: test-linux-stable-int
       artifacts: false
-  variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
   extends:
     - .docker-env
     - .test-refs
     - .pipeline-stopper-artifacts
   script:
     - rusty-cachier snapshot create
     # with-tracing must be explicitly activated, we run a test to ensure this works as expected in both cases
-    - time cargo +nightly test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features
-    - time cargo +nightly test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
+    - time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features
+    - time cargo test --locked --manifest-path ./primitives/tracing/Cargo.toml --no-default-features --features=with-tracing
     - rusty-cachier cache upload
 
 # more information about this job can be found here:
@@ -369,17 +362,16 @@ test-full-crypto-feature:
     - .docker-env
     - .test-refs
   variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
     # Enable debug assertions since we are running optimized builds for testing
     # but still want to have debug assertions.
     RUSTFLAGS: "-C debug-assertions"
     RUST_BACKTRACE: 1
   script:
     - rusty-cachier snapshot create
     - cd primitives/core/
-    - time cargo +nightly build --locked --verbose --no-default-features --features full_crypto
+    - time cargo build --locked --verbose --no-default-features --features full_crypto
     - cd ../application-crypto
-    - time cargo +nightly build --locked --verbose --no-default-features --features full_crypto
+    - time cargo build --locked --verbose --no-default-features --features full_crypto
     - rusty-cachier cache upload
 
 check-rustdoc:
@@ -388,12 +380,11 @@ check-rustdoc:
     - .docker-env
     - .test-refs
   variables:
-    RUSTY_CACHIER_TOOLCHAIN: nightly
     SKIP_WASM_BUILD: 1
     RUSTDOCFLAGS: "-Dwarnings"
   script:
     - rusty-cachier snapshot create
-    - time cargo +nightly doc --locked --workspace --all-features --verbose --no-deps
+    - time cargo doc --locked --workspace --all-features --verbose --no-deps
     - rusty-cachier cache upload
 
 cargo-check-each-crate: