From beec7c71a127967e0d5f4bc392c7c144010270f5 Mon Sep 17 00:00:00 2001 From: Ayelet Zilber Date: Thu, 26 Dec 2024 11:21:14 +0200 Subject: [PATCH] refactor(consensus): move fee_market to concensus --- .../papyrus_consensus_orchestrator/src/fee_market/mod.rs} | 3 +-- .../papyrus_consensus_orchestrator/src/fee_market/test.rs} | 0 crates/sequencing/papyrus_consensus_orchestrator/src/lib.rs | 5 ++++- crates/starknet_batcher/src/lib.rs | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) rename crates/{starknet_batcher/src/fee_market.rs => sequencing/papyrus_consensus_orchestrator/src/fee_market/mod.rs} (98%) rename crates/{starknet_batcher/src/fee_market_test.rs => sequencing/papyrus_consensus_orchestrator/src/fee_market/test.rs} (100%) diff --git a/crates/starknet_batcher/src/fee_market.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/fee_market/mod.rs similarity index 98% rename from crates/starknet_batcher/src/fee_market.rs rename to crates/sequencing/papyrus_consensus_orchestrator/src/fee_market/mod.rs index a102b8ac89..57abc5ad1a 100644 --- a/crates/starknet_batcher/src/fee_market.rs +++ b/crates/sequencing/papyrus_consensus_orchestrator/src/fee_market/mod.rs @@ -1,8 +1,7 @@ use std::cmp::max; #[cfg(test)] -#[path = "fee_market_test.rs"] -pub mod fee_market_test; +mod test; // This constant is used to calculate the base gas price for the next block according to EIP-1559 // and serves as a sensitivity parameter that limits the maximum rate of change of the gas price diff --git a/crates/starknet_batcher/src/fee_market_test.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/fee_market/test.rs similarity index 100% rename from crates/starknet_batcher/src/fee_market_test.rs rename to crates/sequencing/papyrus_consensus_orchestrator/src/fee_market/test.rs diff --git a/crates/sequencing/papyrus_consensus_orchestrator/src/lib.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/lib.rs index 8f7eb6e36d..2cff0c77cf 100644 --- a/crates/sequencing/papyrus_consensus_orchestrator/src/lib.rs +++ b/crates/sequencing/papyrus_consensus_orchestrator/src/lib.rs @@ -8,6 +8,9 @@ pub mod papyrus_consensus_context; #[allow(missing_docs)] pub mod sequencer_consensus_context; -/// Centralized and decentralized communication types and functionallity. +/// Centralized and decentralized communication types and functionality. #[allow(missing_docs)] pub mod cende; + +/// Fee market logic. +pub mod fee_market; diff --git a/crates/starknet_batcher/src/lib.rs b/crates/starknet_batcher/src/lib.rs index a17a44409c..ab7472c08c 100644 --- a/crates/starknet_batcher/src/lib.rs +++ b/crates/starknet_batcher/src/lib.rs @@ -6,7 +6,6 @@ pub mod block_builder; mod block_builder_test; pub mod communication; pub mod config; -pub mod fee_market; #[cfg(test)] mod test_utils; mod transaction_executor;