diff --git a/.github/workflows/mangata-dev.yml b/.github/workflows/mangata-dev.yml index 2f5598bf8585f..e43000adfdc27 100644 --- 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 index 8da71741265e6..da907c1ad8805 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4204,7 +4204,7 @@ dependencies = [ [[package]] name = "mangata-types" version = "0.1.0" -source = "git+https://github.com/mangata-finance/substrate?branch=mangata-dev-v0.9.31#c2f636752b38a5e5a183968fdb09b79e02e604e3" +source = "git+https://github.com/mangata-finance/substrate?branch=mangata-dev#902813c21e6d784fe5e3b67772d3a176afe643ff" dependencies = [ "parity-scale-codec", "scale-info", @@ -4796,12 +4796,12 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-tokens" version = "0.4.1-dev" -source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev-v0.9.31#dd9d7e6eec8e514a1492e4d477c78593e31ffa6f" +source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev#ba84c87dc39d8ff299e3dd3f5bd5636bef046a77" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "mangata-types 0.1.0 (git+https://github.com/mangata-finance/substrate?branch=mangata-dev-v0.9.31)", + "mangata-types 0.1.0 (git+https://github.com/mangata-finance/substrate?branch=mangata-dev)", "orml-traits", "parity-scale-codec", "scale-info", @@ -4813,7 +4813,7 @@ dependencies = [ [[package]] name = "orml-traits" version = "0.4.1-dev" -source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev-v0.9.31#dd9d7e6eec8e514a1492e4d477c78593e31ffa6f" +source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev#ba84c87dc39d8ff299e3dd3f5bd5636bef046a77" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -4831,7 +4831,7 @@ dependencies = [ [[package]] name = "orml-utilities" version = "0.4.1-dev" -source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev-v0.9.31#dd9d7e6eec8e514a1492e4d477c78593e31ffa6f" +source = "git+https://github.com/mangata-finance//open-runtime-module-library?branch=mangata-dev#ba84c87dc39d8ff299e3dd3f5bd5636bef046a77" dependencies = [ "frame-support", "parity-scale-codec", diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs index 6515ace896f0e..e867de87c6e23 100644 --- 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 { <(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::pre_upgrade().unwrap(); let weight = Self::execute_on_runtime_upgrade(); - <(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::post_upgrade(Vec::::new()).unwrap(); + <(COnRuntimeUpgrade, AllPalletsWithSystem) as OnRuntimeUpgrade>::post_upgrade( + Vec::::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 index c13aeb9e3f825..65f86265c6b9f 100644 --- a/primitives/keystore/src/testing.rs +++ b/primitives/keystore/src/testing.rs @@ -368,11 +368,8 @@ impl SyncCryptoStore for KeyStore { transcript_data: VRFTranscriptData, ) -> Result, 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 }))