bump stable, fmt with nightly

integritee-network · Jun 3, 2024 · 13a4cb1 · 13a4cb1
1 parent a799a6d
commit 13a4cb1
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+'
       - '[0-9]+.[0-9]+.[0-9]+-dev*'
   pull_request:
-    branches: [master]
+    branches: [ master ]
   workflow_dispatch:
     inputs:
       verbose:
@@ -49,9 +49,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04]
-        rust: [stable]
-        binary: [release]
+        os: [ ubuntu-22.04 ]
+        rust: [ stable ]
+        binary: [ release ]
     env:
       RUST_BACKTRACE: full
       RUSTV: ${{ matrix.rust }}
@@ -76,8 +76,8 @@ jobs:
 
       - name: Install protobuf
         run: |
-           sudo apt update
-           sudo apt install --assume-yes protobuf-compiler
+          sudo apt update
+          sudo apt install --assume-yes protobuf-compiler
 
       - name: Release
         if: ${{ matrix.binary == 'release' }}
@@ -104,9 +104,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04]
-        rust: [stable]
-        binary: [release]
+        os: [ ubuntu-22.04 ]
+        rust: [ stable ]
+        binary: [ release ]
     env:
       RUST_BACKTRACE: full
       RUSTV: ${{ matrix.rust }}
@@ -162,11 +162,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        rust: [stable]
-        rust-target: [x86_64-unknown-linux-gnu]
-#        check: [fmt --all -- --check, clippy -- -D warnings]
-        check: [fmt --all -- --check, check --features runtime-benchmarks] # skip clippy for now
+        os: [ ubuntu-latest ]
+        rust: [ nightly-2024-04-14 ]
+        rust-target: [ x86_64-unknown-linux-gnu ]
+        #        check: [fmt --all -- --check, clippy -- -D warnings]
+        check: [ +nightly fmt --all -- --check, check --features runtime-benchmarks ] # skip clippy for now
     env:
       RUST_BACKTRACE: full
       RUSTV: ${{ matrix.rust }}
@@ -231,7 +231,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        runtime: ["shell", "integritee"]
+        runtime: [ "shell", "integritee" ]
     steps:
       - uses: actions/checkout@v3
 
@@ -285,12 +285,12 @@ jobs:
           subwasm meta ${{ steps.srtool_build.outputs.wasm }}
           subwasm --json meta ${{ steps.srtool_build.outputs.wasm }} > ${{ matrix.runtime }}-metadata.json
 
-# This is unsupported it wants to diff the metadata with a running chain. i.e. wss://kusama-<matrix.chain>-rpc.parity.io
-#      - name: Check the metadata diff
-#        shell: bash
-#        run: |
-#          subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.chain }} > ${{ matrix.chain }}-diff.txt
-#          cat ${{ matrix.chain }}-diff.txt
+      # This is unsupported it wants to diff the metadata with a running chain. i.e. wss://kusama-<matrix.chain>-rpc.parity.io
+      #      - name: Check the metadata diff
+      #        shell: bash
+      #        run: |
+      #          subwasm diff ${{ steps.srtool_build.outputs.wasm }} --chain-b ${{ matrix.chain }} > ${{ matrix.chain }}-diff.txt
+      #          cat ${{ matrix.chain }}-diff.txt
 
       - name: Archive Subwasm results
         uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
@@ -320,8 +320,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        chain: [integritee]
-        config: [rococo, westend, kusama, polkadot, moonbase, paseo]
+        chain: [ integritee ]
+        config: [ rococo, westend, kusama, polkadot, moonbase, paseo ]
         include:
           - chain: shell
             config: kusama-lease2
@@ -368,7 +368,7 @@ jobs:
     name: Draft Release
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
-    needs: [create_artifacts, build_primary_binaries, check]
+    needs: [ create_artifacts, build_primary_binaries, check ]
     outputs:
       release_url: ${{ steps.create-release.outputs.html_url }}
       asset_upload_url: ${{ steps.create-release.outputs.upload_url }}
@@ -415,10 +415,10 @@ jobs:
   publish-runtimes:
     name: Publish Runtimes
     runs-on: ubuntu-latest
-    needs: ["release"]
+    needs: [ "release" ]
     strategy:
       matrix:
-        runtime: ["shell", "integritee"]
+        runtime: [ "shell", "integritee" ]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/download-artifact@v3

diff --git a/polkadot-parachains/common/src/xcm_config.rs b/polkadot-parachains/common/src/xcm_config.rs
@@ -40,7 +40,7 @@ where
 	fn contains(asset: &Asset, origin: &Location) -> bool {
 		if let Some(ref reserve) = ReserveProvider::reserve(asset) {
 			if reserve == origin {
-				return true;
+				return true
 			}
 		}
 		false
@@ -61,7 +61,7 @@ where
 	fn matches_fungible(a: &Asset) -> Option<Amount> {
 		if let (Fungible(ref amount), AssetId(location)) = (&a.fun, &a.id) {
 			if CurrencyIdConvert::convert(location.clone()).is_some() {
-				return CheckedConversion::checked_from(*amount);
+				return CheckedConversion::checked_from(*amount)
 			}
 		}
 		None

diff --git a/polkadot-parachains/integritee-runtime/src/lib.rs b/polkadot-parachains/integritee-runtime/src/lib.rs
@@ -595,7 +595,7 @@ pub struct NoConversion;
 impl ConversionFromAssetBalance<u128, (), u128> for NoConversion {
 	type Error = ();
 	fn from_asset_balance(balance: Balance, _asset_id: ()) -> Result<Balance, Self::Error> {
-		return Ok(balance);
+		return Ok(balance)
 	}
 	#[cfg(feature = "runtime-benchmarks")]
 	fn ensure_successful(_: ()) {}
@@ -808,7 +808,7 @@ impl EnsureOriginWithArg<RuntimeOrigin, AssetIdForTrustBackedAssets> for NoAsset
 		o: RuntimeOrigin,
 		_a: &AssetIdForTrustBackedAssets,
 	) -> sp_std::result::Result<Self::Success, RuntimeOrigin> {
-		return Err(o);
+		return Err(o)
 	}
 
 	#[cfg(feature = "runtime-benchmarks")]

diff --git a/polkadot-parachains/integritee-runtime/src/migrations.rs b/polkadot-parachains/integritee-runtime/src/migrations.rs
@@ -102,7 +102,7 @@ pub mod scheduler {
 					Expected version == 4, found {:?}",
 						onchain_version,
 					);
-					return T::DbWeight::get().reads(1);
+					return T::DbWeight::get().reads(1)
 				}
 				log::info!(target: TARGET, "migrating from {:?} to 4, purging agenda", onchain_version);
 				let purged_agendas = v1::Agenda::<T>::clear(u32::MAX, None).unique as u64;

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,14 +1,14 @@
 [toolchain]
-channel = "nightly-2023-11-01"
+channel = "1.77.0"
 components = [
-	"cargo",
-	"clippy",
-	"rust-analyzer",
-	"rust-src",
-	"rust-std",
-	"rustc",
-	"rustc-dev",
-	"rustfmt",
+    "cargo",
+    "clippy",
+    "rust-analyzer",
+    "rust-src",
+    "rust-std",
+    "rustc",
+    "rustc-dev",
+    "rustfmt",
 ]
 targets = ["wasm32-unknown-unknown"]
 profile = "default" # include rustfmt, clippy