From 67811bc2b98f1f2ec33b709de30c79535cd6b044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Thu, 3 Mar 2022 11:20:06 +0100 Subject: [PATCH] Tidy up commented lines, unnecessary imports --- Cargo.lock | 1 - .../vesting-contract/src/lib.rs | 4 ++-- common/network-defaults/Cargo.toml | 1 - common/network-defaults/src/all.rs | 1 - common/network-defaults/src/lib.rs | 5 +++-- explorer-api/src/client.rs | 1 - .../websocket/connection_handler/eth_events.rs | 13 ++++--------- validator-api/src/config/mod.rs | 1 - 8 files changed, 9 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9dbec1215e..89cad2ff34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3734,7 +3734,6 @@ name = "network-defaults" version = "0.1.0" dependencies = [ "cfg-if 1.0.0", - "cosmrs", "hex-literal", "once_cell", "serde", diff --git a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs index e798d8b237..4e8b951506 100644 --- a/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs +++ b/common/cosmwasm-smart-contracts/vesting-contract/src/lib.rs @@ -1,6 +1,6 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 - +use config::defaults::DENOM; use cosmwasm_std::{Coin, Timestamp}; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; @@ -9,7 +9,7 @@ pub mod events; pub mod messages; pub fn one_ucoin() -> Coin { - Coin::new(1, config::defaults::DENOM) + Coin::new(1, DENOM) } #[cfg_attr(feature = "ts-rs", derive(ts_rs::TS))] diff --git a/common/network-defaults/Cargo.toml b/common/network-defaults/Cargo.toml index 271476a0a5..85282473ce 100644 --- a/common/network-defaults/Cargo.toml +++ b/common/network-defaults/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] cfg-if = "1.0.0" -cosmrs = { version = "0.4.1", features = [ "bip32", "cosmwasm" ]} hex-literal = "0.3.3" once_cell = "1.7.2" serde = {version = "1.0", features = ["derive"]} diff --git a/common/network-defaults/src/all.rs b/common/network-defaults/src/all.rs index 865589963b..51bc7e5d10 100644 --- a/common/network-defaults/src/all.rs +++ b/common/network-defaults/src/all.rs @@ -118,7 +118,6 @@ pub struct SupportedNetworks { impl SupportedNetworks { pub fn new(support: Vec) -> Self { - // let mut networks: HashMap = HashMap::new(); let mut networks = HashMap::new(); for network in support { diff --git a/common/network-defaults/src/lib.rs b/common/network-defaults/src/lib.rs index 250f1cbe8c..64b9a978af 100644 --- a/common/network-defaults/src/lib.rs +++ b/common/network-defaults/src/lib.rs @@ -11,8 +11,9 @@ pub mod mainnet; pub mod qa; pub mod sandbox; -// Thes set of defaults that are decided at compile time -// Keep DENOM around mostly for use in contracts. (TODO: consider moving it there?) +// The set of defaults that are decided at compile time. Ideally we want to reduce these to a +// minimum. +// Keep DENOM around mostly for use in contracts. (TODO: consider moving it there, or renaming?) cfg_if::cfg_if! { if #[cfg(network = "mainnet")] { pub const DEFAULT_NETWORK: all::Network = all::Network::MAINNET; diff --git a/explorer-api/src/client.rs b/explorer-api/src/client.rs index 0884c7af65..b38e5a213b 100644 --- a/explorer-api/src/client.rs +++ b/explorer-api/src/client.rs @@ -3,7 +3,6 @@ use validator_client::nymd::QueryNymdClient; pub(crate) fn new_nymd_client() -> validator_client::Client { let network = DEFAULT_NETWORK; - // WIP(JON): remove me, should pick up from network variable passed as first argument let mixnet_contract = network.mixnet_contract_address().to_string(); let nymd_url = default_nymd_endpoints()[0].clone(); let api_url = default_api_endpoints()[0].clone(); diff --git a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs index 47db94a54d..2bb81aefcd 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/eth_events.rs @@ -3,6 +3,7 @@ use bip39::core::str::FromStr; use bip39::Mnemonic; +use config::defaults::DEFAULT_NETWORK; use rand::seq::SliceRandom; use rand::thread_rng; use url::Url; @@ -38,18 +39,12 @@ impl ERC20Bridge { .expect("The list of validators is empty"); let mnemonic = Mnemonic::from_str(&cosmos_mnemonic).expect("Invalid Cosmos mnemonic provided"); - let default_network = config::defaults::DEFAULT_NETWORK; let nymd_client = NymdClient::connect_with_mnemonic( - default_network, - // config::defaults::DEFAULT_NETWORK, + DEFAULT_NETWORK, nymd_url.as_ref(), - // AccountId::from_str(DEFAULT_MIXNET_CONTRACT_ADDRESS).ok(), - // WIP(JON): remove me, overriding default with default is not needed - AccountId::from_str(default_network.mixnet_contract_address()).ok(), - // Some(default_network.mixnet_contract_address().clone()), + AccountId::from_str(DEFAULT_NETWORK.mixnet_contract_address()).ok(), None, - // AccountId::from_str(DEFAULT_BANDWIDTH_CLAIM_CONTRACT_ADDRESS).ok(), - AccountId::from_str(default_network.bandwidth_claim_contract_address()).ok(), + AccountId::from_str(DEFAULT_NETWORK.bandwidth_claim_contract_address()).ok(), mnemonic, None, ) diff --git a/validator-api/src/config/mod.rs b/validator-api/src/config/mod.rs index 5c05a4be3d..592149308b 100644 --- a/validator-api/src/config/mod.rs +++ b/validator-api/src/config/mod.rs @@ -97,7 +97,6 @@ impl Default for Base { local_validator: DEFAULT_LOCAL_VALIDATOR .parse() .expect("default local validator is malformed!"), - // mixnet_contract_address: DEFAULT_MIXNET_CONTRACT_ADDRESS.to_string(), mixnet_contract_address: DEFAULT_NETWORK.mixnet_contract_address().to_string(), #[cfg(feature = "coconut")] keypair_bs58: String::default(),