From 3ecb5306ebdad1d6fd57e586628f2aa937c3eae1 Mon Sep 17 00:00:00 2001
From: Squirrel <gilescope@gmail.com>
Date: Wed, 27 Apr 2022 18:19:07 +0100
Subject: [PATCH] Updating shell.nix nightly (#11266)

* The 2022-02-10 nightly can't build some deps

There's a sig that returns `impl IntoIterator<Item = (&'static str, OsString)>` and an Option is being retured but it's incorrectly not allowing a `?` in the method.

* removing duplicate test

* [ci] add job cargo-check-nixos

* add dummy variables nix check

* fix check-dependent jobs

* fix check-dependent-project template

Co-authored-by: alvicsam <alvicsam@gmail.com>
---
 substrate/.gitlab-ci.yml                      | 14 ++++++++++++++
 substrate/shell.nix                           |  2 +-
 .../frame/remote-externalities/src/lib.rs     | 19 +------------------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/substrate/.gitlab-ci.yml b/substrate/.gitlab-ci.yml
index 0c06f3eb9c..bd75cb0bac 100644
--- a/substrate/.gitlab-ci.yml
+++ b/substrate/.gitlab-ci.yml
@@ -263,6 +263,20 @@ cargo-clippy:
   script:
     - SKIP_WASM_BUILD=1 env -u RUSTFLAGS cargo +nightly clippy --all-targets
 
+cargo-check-nixos:
+  stage:                           test
+  <<:                              *docker-env
+  <<:                              *test-refs
+  before_script:                   []
+  variables:
+    CI_IMAGE:                      "nixos/nix"
+    SNAP:                          "DUMMY"
+    WS_API:                        "DUMMY"
+  script:
+    - nix-channel --update
+    - nix-shell shell.nix
+    - nix-shell --run "cargo check --workspace --all-targets --all-features"
+
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-env
diff --git a/substrate/shell.nix b/substrate/shell.nix
index 023946ce16..c318995605 100644
--- a/substrate/shell.nix
+++ b/substrate/shell.nix
@@ -5,7 +5,7 @@ let
       rev = "15b7a05f20aab51c4ffbefddb1b448e862dccb7d";
     });
   nixpkgs = import <nixpkgs> { overlays = [ mozillaOverlay ]; };
-  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-02-10"; channel = "nightly"; }).rust.override {
+  rust-nightly = with nixpkgs; ((rustChannelOf { date = "2022-04-20"; channel = "nightly"; }).rust.override {
     extensions = [ "rust-src" ];
     targets = [ "wasm32-unknown-unknown" ];
   });
diff --git a/substrate/utils/frame/remote-externalities/src/lib.rs b/substrate/utils/frame/remote-externalities/src/lib.rs
index 018ad2f4e0..a717a93f07 100644
--- a/substrate/utils/frame/remote-externalities/src/lib.rs
+++ b/substrate/utils/frame/remote-externalities/src/lib.rs
@@ -1098,21 +1098,6 @@ mod remote_tests {
 		}
 	}
 
-	#[tokio::test]
-	async fn can_build_child_tree() {
-		init_logger();
-		Builder::<Block>::new()
-			.mode(Mode::Online(OnlineConfig {
-				transport: "wss://rpc.polkadot.io:443".to_owned().into(),
-				pallets: vec!["Crowdloan".to_owned()],
-				..Default::default()
-			}))
-			.build()
-			.await
-			.expect(REMOTE_INACCESSIBLE)
-			.execute_with(|| {});
-	}
-
 	#[tokio::test]
 	async fn can_create_child_snapshot() {
 		init_logger();
@@ -1196,9 +1181,7 @@ mod remote_tests {
 		init_logger();
 		Builder::<Block>::new()
 			.mode(Mode::Online(OnlineConfig {
-				// transport: "wss://kusama-rpc.polkadot.io".to_owned().into(),
-				transport: "ws://kianenigma-archive:9924".to_owned().into(),
-				// transport: "ws://localhost:9999".to_owned().into(),
+				transport: "wss://rpc.polkadot.io:443".to_owned().into(),
 				pallets: vec!["Crowdloan".to_owned()],
 				..Default::default()
 			}))