sugondat-shim: rename AdapterServerParams

Author: pepyakin

sugondat-shim/src/cli.rs

@@ -11,12 +11,12 @@ struct Cli {
     command: Commands,
 }
 
-/// Common parameters for all subcommands.
+/// Common parameters for the adapter subcommands.
 ///
 /// It's not declared on the `Cli` struct with `clap(flatten)` because of how the syntax
 /// `sugondat-shim -p 10 serve --node-url` looks unintuitive.
 #[derive(clap::Args, Debug)]
-pub struct CommonParams {
+pub struct AdapterServerParams {
     /// The address on which the shim should listen for incoming connections from the rollup nodes.
     #[clap(short, long, default_value = "127.0.0.1", group = "listen")]
     pub address: String,
@@ -33,7 +33,7 @@ pub struct CommonParams {
     // TODO: e.g. --submit-key, prometheus stuff, enabled adapters, etc.
 }
 
-impl CommonParams {
+impl AdapterServerParams {
     /// Whether the sovereign adapter should be enabled.
     pub fn enable_sovereign(&self) -> bool {
         true

sugondat-shim/src/serve.rs

@@ -1,4 +1,6 @@
-use crate::{adapters::sovereign::SovereignAdapter, cli::CommonParams, sugondat_rpc::Client};
+use crate::{
+    adapters::sovereign::SovereignAdapter, cli::AdapterServerParams, sugondat_rpc::Client,
+};
 use clap::Args;
 use jsonrpsee::{server::Server, Methods};
 use sugondat_shim_common_sovereign::SovereignRPCServer;
@@ -11,18 +13,18 @@ pub struct Params {
     node_url: String,
 
     #[clap(flatten)]
-    common: CommonParams,
+    adapter: AdapterServerParams,
 }
 
 pub async fn run(params: Params) -> anyhow::Result<()> {
     info!(
         "starting sugondat-shim server on {}:{}",
-        params.common.address, params.common.port
+        params.adapter.address, params.adapter.port
     );
-    let listen_on = (params.common.address.as_str(), params.common.port);
+    let listen_on = (params.adapter.address.as_str(), params.adapter.port);
     let server = Server::builder().build(listen_on).await?;
     let client = connect_client(&params.node_url).await?;
-    let handle = server.start(init_adapters(client, &params.common));
+    let handle = server.start(init_adapters(client, &params.adapter));
     handle.stopped().await;
     Ok(())
 }
@@ -32,9 +34,9 @@ async fn connect_client(url: &str) -> anyhow::Result<Client> {
     Ok(client)
 }
 
-fn init_adapters(client: Client, common: &CommonParams) -> Methods {
+fn init_adapters(client: Client, adapter: &AdapterServerParams) -> Methods {
     let mut methods = Methods::new();
-    if common.enable_sovereign() {
+    if adapter.enable_sovereign() {
         debug!("enabling sovereign adapter");
         let adapter = SovereignAdapter::new(client.clone());
         methods.merge(adapter.into_rpc()).unwrap();