Move var from env to config

Author: maxgttph

server/src/conf.rs

@@ -12,6 +12,8 @@ pub struct Conf {
     pub data_directory: PathBuf,
     /// When running only the indexer, the address of the DA server to connect to
     pub da_read_from: String,
+    pub node_url: String,
+    pub indexer_url: String,
 
     pub rest_server_port: u16,
     pub rest_server_max_body_size: usize,

server/src/conf_defaults.toml

@@ -6,11 +6,11 @@ da_read_from = "127.0.0.1:4141"
 
 rest_server_port = 4000
 rest_server_max_body_size = 10_485_760 # 10 MB
-
-da_address = "127.0.0.1:4141"
+node_url = "http://localhost:4321"
+indexer_url = "http://localhost:4321"
 
 [websocket]
-port = 8081
+port = 8080
 ws_path = "/ws"
 health_path = "/ws_health"
 peer_check_interval.secs = 0

server/src/main.rs

@@ -23,10 +23,7 @@ use hyle_modules::{
 
 use prometheus::Registry;
 use sdk::{api::NodeInfo, info, ContractName, ZkContract};
-use std::{
-    env,
-    sync::{Arc, Mutex},
-};
+use std::sync::{Arc, Mutex};
 use tracing::error;
 use wallet::{client::indexer::WalletEvent, Wallet};
 
@@ -60,12 +57,11 @@ async fn main() -> Result<()> {
 
     info!("Starting app with config: {:?}", &config);
 
-    let node_url = env::var("NODE_URL").unwrap_or_else(|_| "http://localhost:4321".to_string());
-    let indexer_url =
-        env::var("INDEXER_URL").unwrap_or_else(|_| "http://localhost:4321".to_string());
-    let node_client = Arc::new(NodeApiHttpClient::new(node_url).context("build node client")?);
-    let indexer_client =
-        Arc::new(IndexerApiHttpClient::new(indexer_url).context("build indexer client")?);
+    let node_client =
+        Arc::new(NodeApiHttpClient::new(config.node_url.clone()).context("build node client")?);
+    let indexer_client = Arc::new(
+        IndexerApiHttpClient::new(config.indexer_url.clone()).context("build indexer client")?,
+    );
 
     let wallet_cn: ContractName = args.wallet_cn.clone().into();