Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update toolchain to new version #80

Merged
merged 4 commits into from
Jan 4, 2023
Merged

chore: update toolchain to new version #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da8ab20
chore: update toolchain to new version
devdanco Jan 4, 2023
bae47ca
add protoc github action and fix fmt
devdanco Jan 4, 2023
719072a
remove unnecessary github action
devdanco Jan 4, 2023
fcc108e
fix API rate limit
devdanco Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/mangata-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
name: CI

env:
TOOLCHAIN: nightly-2022-05-11
TOOLCHAIN: nightly-2022-09-19


jobs:
Expand All @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions frame/executive/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
//! `Executive` type declaration from the node template.
//!
//! ```
//!
//!
//! # use sp_runtime::generic;
//! # use frame_executive as executive;
//! # pub struct UncheckedExtrinsic {};
Expand Down Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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,
Expand Down
7 changes: 2 additions & 5 deletions primitives/keystore/src/testing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }))
Expand Down