From 6f89ad086b2242897fdf26569c11c2bb79afbfb3 Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Mon, 30 Jan 2023 13:36:39 +0200 Subject: [PATCH] chore(sync): consistent stage ids (#1085) --- crates/stages/src/stages/hashing_account.rs | 2 +- crates/stages/src/stages/hashing_storage.rs | 2 +- crates/stages/src/stages/index_account_history.rs | 2 +- crates/stages/src/stages/index_storage_history.rs | 2 +- crates/stages/src/stages/merkle.rs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/stages/src/stages/hashing_account.rs b/crates/stages/src/stages/hashing_account.rs index 757609461b..7a06e86ef2 100644 --- a/crates/stages/src/stages/hashing_account.rs +++ b/crates/stages/src/stages/hashing_account.rs @@ -15,7 +15,7 @@ use std::{ use tracing::*; /// The [`StageId`] of the account hashing stage. -pub const ACCOUNT_HASHING: StageId = StageId("AccountHashingStage"); +pub const ACCOUNT_HASHING: StageId = StageId("AccountHashing"); /// Account hashing stage hashes plain account. /// This is preparation before generating intermediate hashes and calculating Merkle tree root. diff --git a/crates/stages/src/stages/hashing_storage.rs b/crates/stages/src/stages/hashing_storage.rs index e984fe937d..ecaf9118ff 100644 --- a/crates/stages/src/stages/hashing_storage.rs +++ b/crates/stages/src/stages/hashing_storage.rs @@ -13,7 +13,7 @@ use std::{collections::BTreeMap, fmt::Debug}; use tracing::*; /// The [`StageId`] of the storage hashing stage. -pub const STORAGE_HASHING: StageId = StageId("StorageHashingStage"); +pub const STORAGE_HASHING: StageId = StageId("StorageHashing"); /// Storage hashing stage hashes plain storage. /// This is preparation before generating intermediate hashes and calculating Merkle tree root. diff --git a/crates/stages/src/stages/index_account_history.rs b/crates/stages/src/stages/index_account_history.rs index 6d2888c969..0afee324f2 100644 --- a/crates/stages/src/stages/index_account_history.rs +++ b/crates/stages/src/stages/index_account_history.rs @@ -14,7 +14,7 @@ use reth_primitives::{Address, TransitionId}; use std::{collections::BTreeMap, fmt::Debug}; use tracing::*; -const INDEX_ACCOUNT_HISTORY: StageId = StageId("IndexAccountHistoryStage"); +const INDEX_ACCOUNT_HISTORY: StageId = StageId("IndexAccountHistory"); /// Stage is indexing history the account changesets generated in /// [`ExecutionStage`][crate::stages::ExecutionStage]. For more information diff --git a/crates/stages/src/stages/index_storage_history.rs b/crates/stages/src/stages/index_storage_history.rs index 99b3381bb8..704defb768 100644 --- a/crates/stages/src/stages/index_storage_history.rs +++ b/crates/stages/src/stages/index_storage_history.rs @@ -14,7 +14,7 @@ use reth_primitives::{Address, TransitionId, H256}; use std::{collections::BTreeMap, fmt::Debug}; use tracing::*; -const INDEX_STORAGE_HISTORY: StageId = StageId("IndexStorageHistoryStage"); +const INDEX_STORAGE_HISTORY: StageId = StageId("IndexStorageHistory"); /// Stage is indexing history the account changesets generated in /// [`ExecutionStage`][crate::stages::ExecutionStage]. For more information diff --git a/crates/stages/src/stages/merkle.rs b/crates/stages/src/stages/merkle.rs index 36c74b058a..aa5a1c784f 100644 --- a/crates/stages/src/stages/merkle.rs +++ b/crates/stages/src/stages/merkle.rs @@ -6,10 +6,10 @@ use std::fmt::Debug; use tracing::*; /// The [`StageId`] of the merkle hashing execution stage. -pub const MERKLE_EXECUTION: StageId = StageId("MerkleExecuteStage"); +pub const MERKLE_EXECUTION: StageId = StageId("MerkleExecute"); /// The [`StageId`] of the merkle hashing unwind stage. -pub const MERKLE_UNWIND: StageId = StageId("MerkleUnwindStage"); +pub const MERKLE_UNWIND: StageId = StageId("MerkleUnwind"); /// The merkle hashing stage uses input from /// [`AccountHashingStage`][crate::stages::AccountHashingStage] and