From 4d98e9d05b6d671b2200f5602d609c4f3e03fb38 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Sat, 9 Oct 2021 18:25:24 +0800 Subject: [PATCH 1/4] add TypeInfo for DispatchTime --- frame/support/src/traits/schedule.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frame/support/src/traits/schedule.rs b/frame/support/src/traits/schedule.rs index a4a4f9c03ab12..19f50a93c0681 100644 --- a/frame/support/src/traits/schedule.rs +++ b/frame/support/src/traits/schedule.rs @@ -18,6 +18,7 @@ //! Traits and associated utilities for scheduling dispatchables in FRAME. use codec::{Codec, Decode, Encode, EncodeLike}; +use scale_info::TypeInfo; use sp_runtime::{DispatchError, RuntimeDebug}; use sp_std::{fmt::Debug, prelude::*}; @@ -31,7 +32,7 @@ pub type Period = (BlockNumber, u32); pub type Priority = u8; /// The dispatch time of a scheduled task. -#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug)] +#[derive(Encode, Decode, Copy, Clone, PartialEq, Eq, RuntimeDebug, TypeInfo)] pub enum DispatchTime { /// At specified block. At(BlockNumber), From c7ab72d326b589e1f8ef11560f43425bfabfc812 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Wed, 10 Nov 2021 08:53:04 +0800 Subject: [PATCH 2/4] upgrade wasm-builder to Rust 2021 --- utils/wasm-builder/src/prerequisites.rs | 2 +- utils/wasm-builder/src/wasm_project.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/wasm-builder/src/prerequisites.rs b/utils/wasm-builder/src/prerequisites.rs index c45f7933a1de3..7236b8169bcb5 100644 --- a/utils/wasm-builder/src/prerequisites.rs +++ b/utils/wasm-builder/src/prerequisites.rs @@ -58,7 +58,7 @@ fn create_check_toolchain_project(project_dir: &Path) { [package] name = "wasm-test" version = "1.0.0" - edition = "2018" + edition = "2021" build = "build.rs" [lib] diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs index 3806a890a1064..ea17f4ecd3780 100644 --- a/utils/wasm-builder/src/wasm_project.rs +++ b/utils/wasm-builder/src/wasm_project.rs @@ -266,7 +266,7 @@ fn create_project_cargo_toml( let mut package = Table::new(); package.insert("name".into(), format!("{}-wasm", crate_name).into()); package.insert("version".into(), "1.0.0".into()); - package.insert("edition".into(), "2018".into()); + package.insert("edition".into(), "2021".into()); package.insert("resolver".into(), "2".into()); wasm_workspace_toml.insert("package".into(), package.into()); From 4ad3efdda6ba38f88463f817fb2ab3d3ac5e2b39 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Wed, 10 Nov 2021 10:49:56 +0800 Subject: [PATCH 3/4] remove resolver --- Cargo.toml | 2 -- utils/wasm-builder/src/wasm_project.rs | 1 - 2 files changed, 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 07053a0ef3162..da11549d5cde5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,4 @@ [workspace] -resolver = "2" - members = [ "bin/node-template/node", "bin/node-template/pallets/template", diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs index ea17f4ecd3780..59214ab483c62 100644 --- a/utils/wasm-builder/src/wasm_project.rs +++ b/utils/wasm-builder/src/wasm_project.rs @@ -267,7 +267,6 @@ fn create_project_cargo_toml( package.insert("name".into(), format!("{}-wasm", crate_name).into()); package.insert("version".into(), "1.0.0".into()); package.insert("edition".into(), "2021".into()); - package.insert("resolver".into(), "2".into()); wasm_workspace_toml.insert("package".into(), package.into()); From e233cc7f5811d7809a0b1f4f639f37006d8b1e78 Mon Sep 17 00:00:00 2001 From: zjb0807 Date: Wed, 10 Nov 2021 11:54:35 +0800 Subject: [PATCH 4/4] revert resolver in virtual workspace --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index da11549d5cde5..07053a0ef3162 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,6 @@ [workspace] +resolver = "2" + members = [ "bin/node-template/node", "bin/node-template/pallets/template",