From 6f27e66e7f3557555de51bc6a82fe54502063190 Mon Sep 17 00:00:00 2001 From: Luke Tchang Date: Tue, 3 May 2022 12:28:08 -0700 Subject: [PATCH] refactor(configuration): simplify from env namespacing --- configuration/src/chains/mod.rs | 8 ++++---- fixtures/env.test | 20 +++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configuration/src/chains/mod.rs b/configuration/src/chains/mod.rs index f926af7c..fbaf558b 100644 --- a/configuration/src/chains/mod.rs +++ b/configuration/src/chains/mod.rs @@ -25,8 +25,8 @@ impl Default for ChainConf { impl FromEnv for ChainConf { fn from_env(network: &str) -> Option { println!("Getting chainconf info"); - let rpc_style = std::env::var(&format!("RPCS_{}_RPCSTYLE", network)).ok()?; - let rpc_url = std::env::var(&format!("RPCS_{}_CONNECTION_URL", network)).ok()?; + let rpc_style = std::env::var(&format!("{}_RPCSTYLE", network)).ok()?; + let rpc_url = std::env::var(&format!("{}_CONNECTION_URL", network)).ok()?; println!("GOT chainconf info"); let json = json!({ @@ -51,11 +51,11 @@ pub enum TxSubmitterConf { impl FromEnv for TxSubmitterConf { fn from_env(network: &str) -> Option { - let rpc_style = std::env::var(&format!("TXSUBMITTERS_{}_RPCSTYLE", network)).ok()?; + let rpc_style = std::env::var(&format!("{}_RPCSTYLE", network)).ok()?; match rpc_style.as_ref() { "ethereum" => Some(Self::Ethereum(ethereum::TxSubmitterConf::from_env( - &format!("TXSUBMITTERS_{}", network), + network, )?)), _ => panic!("Unknown transaction submission rpc style: {}", rpc_style), } diff --git a/fixtures/env.test b/fixtures/env.test index f7ff049f..a42c9155 100644 --- a/fixtures/env.test +++ b/fixtures/env.test @@ -1,20 +1,18 @@ RUN_ENV=test AGENT_HOME=ethereum -RPCS_ETHEREUM_RPCSTYLE=ethereum -RPCS_ETHEREUM_CONNECTION_URL=https://main-light.eth.linkpool.io/ +ETHEREUM_RPCSTYLE=ethereum +MOONBEAM_RPCSTYLE=ethereum -RPCS_MOONBEAM_RPCSTYLE=ethereum -RPCS_MOONBEAM_CONNECTION_URL=https://rpc.api.moonbeam.network +ETHEREUM_CONNECTION_URL=https://main-light.eth.linkpool.io/ +MOONBEAM_CONNECTION_URL=https://rpc.api.moonbeam.network -TXSUBMITTERS_ETHEREUM_RPCSTYLE=ethereum -TXSUBMITTERS_ETHEREUM_SUBMITTERTYPE=local -TXSUBMITTERS_ETHEREUM_SUBMITTER_KEY=0x1111111111111111111111111111111111111111111111111111111111111111 +ETHEREUM_SUBMITTERTYPE=local +ETHEREUM_SUBMITTER_KEY=0x1111111111111111111111111111111111111111111111111111111111111111 -TXSUBMITTERS_MOONBEAM_RPCSTYLE=ethereum -TXSUBMITTERS_MOONBEAM_SUBMITTERTYPE=gelato -TXSUBMITTERS_MOONBEAM_SUBMITTER_SPONSOR_KEY=0x1111111111111111111111111111111111111111111111111111111111111111 -TXSUBMITTERS_MOONBEAM_SUBMITTER_FEETOKEN=0xabcd +MOONBEAM_SUBMITTERTYPE=gelato +MOONBEAM_SUBMITTER_SPONSOR_KEY=0x1111111111111111111111111111111111111111111111111111111111111111 +MOONBEAM_SUBMITTER_FEETOKEN=0xabcd ATTESTATION_SIGNER_ID=dummy_id ATTESTATION_SIGNER_REGION=dummy_region