Merge pull request #80 from mangata-finance/fix-ci

chore: update toolchain to new version
gasp-xyz · Jan 4, 2023 · a0a16a6 · a0a16a6
2 parents 902813c + fcc108e
commit a0a16a6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/.github/workflows/mangata-dev.yml b/.github/workflows/mangata-dev.yml
@@ -9,7 +9,7 @@ on:
 name: CI
 
 env:
-  TOOLCHAIN: nightly-2022-05-11
+  TOOLCHAIN: nightly-2022-09-19
 
 
 jobs:
@@ -34,6 +34,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
       - name: Install ${{ env.TOOLCHAIN }}
         uses: actions-rs/toolchain@v1
@@ -52,6 +56,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
       - name: Install ${{ env.TOOLCHAIN }}
         uses: actions-rs/toolchain@v1

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
@@ -52,7 +52,7 @@
 //! `Executive` type declaration from the node template.
 //!
 //! ```
-//!
+//! 
 //! # use sp_runtime::generic;
 //! # use frame_executive as executive;
 //! # pub struct UncheckedExtrinsic {};
@@ -357,7 +357,10 @@ where
 	pub fn try_runtime_upgrade() -> Result<frame_support::weights::Weight, &'static str> {
 		<(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::pre_upgrade().unwrap();
 		let weight = Self::execute_on_runtime_upgrade();
-		<(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::post_upgrade(Vec::<u8>::new()).unwrap();
+		<(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::post_upgrade(
+			Vec::<u8>::new(),
+		)
+		.unwrap();
 		Ok(weight)
 	}
 }
@@ -796,7 +799,7 @@ mod tests {
 	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
 	use pallet_balances::Call as BalancesCall;
 	use pallet_transaction_payment::CurrencyAdapter;
-	use sp_core::{crypto::key_types::AURA};
+	use sp_core::crypto::key_types::AURA;
 	use sp_keystore::{
 		vrf::{VRFTranscriptData, VRFTranscriptValue},
 		SyncCryptoStore,

diff --git a/primitives/keystore/src/testing.rs b/primitives/keystore/src/testing.rs
@@ -368,11 +368,8 @@ impl SyncCryptoStore for KeyStore {
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error> {
 		let transcript = make_transcript(transcript_data);
-		let pair = if let Some(k) = self.sr25519_key_pair(key_type, public) {
-			k
-		} else {
-			return Ok(None)
-		};
+		let pair =
+			if let Some(k) = self.sr25519_key_pair(key_type, public) { k } else { return Ok(None) };
 
 		let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
 		Ok(Some(VRFSignature { output: inout.to_output(), proof }))