From 87e5f0dc811a34d1205ff30d0efae77292dfa8fd Mon Sep 17 00:00:00 2001 From: Andreas Doerr Date: Thu, 11 Mar 2021 12:56:09 +0100 Subject: [PATCH] Update toolchain (#115) * Use nightly toolchain * dongradde to latest clippy stable * GH workflow trail and error * next try * use stable for clippy * update wasm builder * yet another try * fun with CI * no env var * and one more * allow from_over_into bco contruct_runtime * back to start * well ... * full circle * old version was still used --- frame/beefy/src/mock.rs | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/frame/beefy/src/mock.rs b/frame/beefy/src/mock.rs index c01ef64b74ea2..b094cf732728a 100644 --- a/frame/beefy/src/mock.rs +++ b/frame/beefy/src/mock.rs @@ -14,17 +14,21 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -use std::vec; +// construct_runtime requires this +#![allow(clippy::from_over_into)] -use frame_support::{parameter_types, sp_io::TestExternalities, BasicExternalities}; +use std::vec; -use sp_core::H256; -use sp_runtime::{ - app_crypto::ecdsa::Public, - impl_opaque_keys, - testing::Header, - traits::{BlakeTwo256, ConvertInto, IdentityLookup, OpaqueKeys}, - Perbill, +use { + frame_support::{construct_runtime, parameter_types, sp_io::TestExternalities, BasicExternalities}, + sp_core::H256, + sp_runtime::{ + app_crypto::ecdsa::Public, + impl_opaque_keys, + testing::Header, + traits::{BlakeTwo256, ConvertInto, IdentityLookup, OpaqueKeys}, + Perbill, + }, }; use crate as pallet_beefy; @@ -40,7 +44,7 @@ impl_opaque_keys! { type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; -frame_support::construct_runtime!( +construct_runtime!( pub enum Test where Block = Block, NodeBlock = Block,