From fb960fb3e45e11c24125ccb4bd93f2e2e21ce271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Anda=20Estensen?= Date: Wed, 1 May 2024 10:20:53 +0200 Subject: [PATCH] refactor: remove _args prefix from modules in node_core (#8015) --- .../args/{database_args.rs => database.rs} | 0 .../src/args/{debug_args.rs => debug.rs} | 0 .../src/args/{dev_args.rs => dev.rs} | 0 ...ice_oracle_args.rs => gas_price_oracle.rs} | 0 .../src/args/{log_args.rs => log.rs} | 0 crates/node-core/src/args/mod.rs | 48 +++++++++---------- .../src/args/{network_args.rs => network.rs} | 0 ...oad_builder_args.rs => payload_builder.rs} | 0 .../src/args/{pruning_args.rs => pruning.rs} | 0 .../{rpc_server_args.rs => rpc_server.rs} | 0 ...state_cache_args.rs => rpc_state_cache.rs} | 0 .../src/args/{stage_args.rs => stage.rs} | 0 .../src/args/{txpool_args.rs => txpool.rs} | 0 13 files changed, 24 insertions(+), 24 deletions(-) rename crates/node-core/src/args/{database_args.rs => database.rs} (100%) rename crates/node-core/src/args/{debug_args.rs => debug.rs} (100%) rename crates/node-core/src/args/{dev_args.rs => dev.rs} (100%) rename crates/node-core/src/args/{gas_price_oracle_args.rs => gas_price_oracle.rs} (100%) rename crates/node-core/src/args/{log_args.rs => log.rs} (100%) rename crates/node-core/src/args/{network_args.rs => network.rs} (100%) rename crates/node-core/src/args/{payload_builder_args.rs => payload_builder.rs} (100%) rename crates/node-core/src/args/{pruning_args.rs => pruning.rs} (100%) rename crates/node-core/src/args/{rpc_server_args.rs => rpc_server.rs} (100%) rename crates/node-core/src/args/{rpc_state_cache_args.rs => rpc_state_cache.rs} (100%) rename crates/node-core/src/args/{stage_args.rs => stage.rs} (100%) rename crates/node-core/src/args/{txpool_args.rs => txpool.rs} (100%) diff --git a/crates/node-core/src/args/database_args.rs b/crates/node-core/src/args/database.rs similarity index 100% rename from crates/node-core/src/args/database_args.rs rename to crates/node-core/src/args/database.rs diff --git a/crates/node-core/src/args/debug_args.rs b/crates/node-core/src/args/debug.rs similarity index 100% rename from crates/node-core/src/args/debug_args.rs rename to crates/node-core/src/args/debug.rs diff --git a/crates/node-core/src/args/dev_args.rs b/crates/node-core/src/args/dev.rs similarity index 100% rename from crates/node-core/src/args/dev_args.rs rename to crates/node-core/src/args/dev.rs diff --git a/crates/node-core/src/args/gas_price_oracle_args.rs b/crates/node-core/src/args/gas_price_oracle.rs similarity index 100% rename from crates/node-core/src/args/gas_price_oracle_args.rs rename to crates/node-core/src/args/gas_price_oracle.rs diff --git a/crates/node-core/src/args/log_args.rs b/crates/node-core/src/args/log.rs similarity index 100% rename from crates/node-core/src/args/log_args.rs rename to crates/node-core/src/args/log.rs diff --git a/crates/node-core/src/args/mod.rs b/crates/node-core/src/args/mod.rs index 14b63dd743..bce63917b7 100644 --- a/crates/node-core/src/args/mod.rs +++ b/crates/node-core/src/args/mod.rs @@ -1,55 +1,55 @@ //! Parameters for configuring the rpc more granularity via CLI /// NetworkArg struct for configuring the network -mod network_args; -pub use network_args::{DiscoveryArgs, NetworkArgs}; +mod network; +pub use network::{DiscoveryArgs, NetworkArgs}; /// RpcServerArg struct for configuring the RPC -mod rpc_server_args; -pub use rpc_server_args::RpcServerArgs; +mod rpc_server; +pub use rpc_server::RpcServerArgs; /// RpcStateCacheArgs struct for configuring RPC state cache -mod rpc_state_cache_args; -pub use rpc_state_cache_args::RpcStateCacheArgs; +mod rpc_state_cache; +pub use rpc_state_cache::RpcStateCacheArgs; /// DebugArgs struct for debugging purposes -mod debug_args; -pub use debug_args::DebugArgs; +mod debug; +pub use debug::DebugArgs; /// DatabaseArgs struct for configuring the database -mod database_args; -pub use database_args::DatabaseArgs; +mod database; +pub use database::DatabaseArgs; /// LogArgs struct for configuring the logger -mod log_args; -pub use log_args::{ColorMode, LogArgs}; +mod log; +pub use log::{ColorMode, LogArgs}; mod secret_key; pub use secret_key::{get_secret_key, SecretKeyError}; /// PayloadBuilderArgs struct for configuring the payload builder -mod payload_builder_args; -pub use payload_builder_args::PayloadBuilderArgs; +mod payload_builder; +pub use payload_builder::PayloadBuilderArgs; /// Stage related arguments -mod stage_args; -pub use stage_args::StageEnum; +mod stage; +pub use stage::StageEnum; /// Gas price oracle related arguments -mod gas_price_oracle_args; -pub use gas_price_oracle_args::GasPriceOracleArgs; +mod gas_price_oracle; +pub use gas_price_oracle::GasPriceOracleArgs; /// TxPoolArgs for configuring the transaction pool -mod txpool_args; -pub use txpool_args::TxPoolArgs; +mod txpool; +pub use txpool::TxPoolArgs; /// DevArgs for configuring the dev testnet -mod dev_args; -pub use dev_args::DevArgs; +mod dev; +pub use dev::DevArgs; /// PruneArgs for configuring the pruning and full node -mod pruning_args; -pub use pruning_args::PruningArgs; +mod pruning; +pub use pruning::PruningArgs; pub mod utils; diff --git a/crates/node-core/src/args/network_args.rs b/crates/node-core/src/args/network.rs similarity index 100% rename from crates/node-core/src/args/network_args.rs rename to crates/node-core/src/args/network.rs diff --git a/crates/node-core/src/args/payload_builder_args.rs b/crates/node-core/src/args/payload_builder.rs similarity index 100% rename from crates/node-core/src/args/payload_builder_args.rs rename to crates/node-core/src/args/payload_builder.rs diff --git a/crates/node-core/src/args/pruning_args.rs b/crates/node-core/src/args/pruning.rs similarity index 100% rename from crates/node-core/src/args/pruning_args.rs rename to crates/node-core/src/args/pruning.rs diff --git a/crates/node-core/src/args/rpc_server_args.rs b/crates/node-core/src/args/rpc_server.rs similarity index 100% rename from crates/node-core/src/args/rpc_server_args.rs rename to crates/node-core/src/args/rpc_server.rs diff --git a/crates/node-core/src/args/rpc_state_cache_args.rs b/crates/node-core/src/args/rpc_state_cache.rs similarity index 100% rename from crates/node-core/src/args/rpc_state_cache_args.rs rename to crates/node-core/src/args/rpc_state_cache.rs diff --git a/crates/node-core/src/args/stage_args.rs b/crates/node-core/src/args/stage.rs similarity index 100% rename from crates/node-core/src/args/stage_args.rs rename to crates/node-core/src/args/stage.rs diff --git a/crates/node-core/src/args/txpool_args.rs b/crates/node-core/src/args/txpool.rs similarity index 100% rename from crates/node-core/src/args/txpool_args.rs rename to crates/node-core/src/args/txpool.rs