From 017b2a8e26657b8a15ab5ed4d8f97e2ccb8ab486 Mon Sep 17 00:00:00 2001 From: jasl Date: Tue, 28 Feb 2023 03:08:56 +0800 Subject: [PATCH] Backport https://github.com/Phala-Network/phala-blockchain/pull/1174 --- Cargo.lock | 3 +-- crates/phala-node-rpc-ext/Cargo.toml | 3 --- crates/phala-node-rpc-ext/src/storage_changes.rs | 3 +-- node/Cargo.toml | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ee2ef31..3a9a6e43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3778,7 +3778,7 @@ dependencies = [ [[package]] name = "khala-node" -version = "0.1.20-4" +version = "0.1.20-8" dependencies = [ "async-trait", "clap", @@ -6671,7 +6671,6 @@ dependencies = [ "phala-mq", "phala-node-rpc-ext-types", "phala-pallets", - "rayon", "sc-client-api", "sc-rpc", "sc-transaction-pool-api", diff --git a/crates/phala-node-rpc-ext/Cargo.toml b/crates/phala-node-rpc-ext/Cargo.toml index 9f6c5225..6e2c1acf 100644 --- a/crates/phala-node-rpc-ext/Cargo.toml +++ b/crates/phala-node-rpc-ext/Cargo.toml @@ -32,6 +32,3 @@ phala-mq = { path = "../../crates/phala-mq" } phala-pallets = { path = "../../pallets/phala" } pallet-mq-runtime-api = { path = "../../pallets/phala/mq-runtime-api" } ext-types = { path = "./types", package = "phala-node-rpc-ext-types" } - -rayon = "1" - diff --git a/crates/phala-node-rpc-ext/src/storage_changes.rs b/crates/phala-node-rpc-ext/src/storage_changes.rs index 59844200..54da81ee 100644 --- a/crates/phala-node-rpc-ext/src/storage_changes.rs +++ b/crates/phala-node-rpc-ext/src/storage_changes.rs @@ -1,6 +1,5 @@ use super::*; pub use ext_types::*; -use rayon::prelude::*; /// State RPC errors. #[derive(Debug, thiserror::Error)] @@ -107,7 +106,7 @@ where } headers - .into_par_iter() + .into_iter() .map(|(id, mut header)| -> Result<_, Error> { let api = client.runtime_api(); let hash = client.expect_block_hash_from_id(&id).expect("Should get the block hash"); diff --git a/node/Cargo.toml b/node/Cargo.toml index 4ce2d2d5..e696c738 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "khala-node" -version = "0.1.20-4" +version = "0.1.20-8" license = "Apache-2.0" homepage = "https://phala.network/" repository = "https://github.com/Phala-Network/khala-parachain"