Merge pull request #13 from onomyprotocol/dzmitryhil/disable-orchestr…

…ator-market-by-default disable orchestrator market by default
onomyprotocol · Dec 20, 2021 · bc9716e · bc9716e
2 parents 175f7ae + bfc5cdf
commit bc9716e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/orchestrator/gbt/src/default-config.toml b/orchestrator/gbt/src/default-config.toml
@@ -5,5 +5,5 @@ relayer_enabled = true
 
 [relayer]
 valset_market_enabled = false
-batch_market_enabled = true
-logic_call_market_enabled = true
+batch_market_enabled = false
+logic_call_market_enabled = false
diff --git a/orchestrator/gravity_utils/src/types/config.rs b/orchestrator/gravity_utils/src/types/config.rs
@@ -28,11 +28,11 @@ fn default_valset_market_enabled() -> bool {
 }
 
 fn default_batch_market_enabled() -> bool {
-    true
+    false
 }
 
 fn default_logic_call_market_enabled() -> bool {
-    true
+    false
 }
 
 impl Default for RelayerConfig {

diff --git a/orchestrator/test_runner/src/relay_market.rs b/orchestrator/test_runner/src/relay_market.rs
@@ -4,7 +4,10 @@
 use std::time::{Duration, Instant};
 
 use crate::happy_path::test_erc20_deposit;
-use crate::utils::{check_cosmos_balance, send_one_eth, start_orchestrators, ValidatorKeys};
+use crate::utils::{
+    check_cosmos_balance, create_market_test_config, send_one_eth, start_orchestrators,
+    ValidatorKeys,
+};
 use crate::MINER_PRIVATE_KEY;
 use crate::TOTAL_TIMEOUT;
 use crate::{one_eth, MINER_ADDRESS};
@@ -18,7 +21,6 @@ use deep_space::private_key::PrivateKey as CosmosPrivateKey;
 use deep_space::{Address, Contact};
 use ethereum_gravity::utils::get_tx_batch_nonce;
 use gravity_proto::gravity::query_client::QueryClient as GravityQueryClient;
-use gravity_utils::types::GravityBridgeToolsConfig;
 use rand::Rng;
 use tokio::time::sleep as delay_for;
 use tonic::transport::Channel;
@@ -44,8 +46,9 @@ async fn test_batches(
     gravity_address: EthAddress,
 ) {
     // Start Orchestrators
-    let default_config = GravityBridgeToolsConfig::default();
-    start_orchestrators(keys.clone(), gravity_address, false, default_config).await;
+    let relay_market_config = create_market_test_config();
+    start_orchestrators(keys.clone(), gravity_address, false, relay_market_config).await;
+
     test_good_batch(
         web30,
         grpc_client,

diff --git a/orchestrator/test_runner/src/utils.rs b/orchestrator/test_runner/src/utils.rs
@@ -33,6 +33,14 @@ pub fn create_default_test_config() -> GravityBridgeToolsConfig {
     no_relay_market_config
 }
 
+pub fn create_market_test_config() -> GravityBridgeToolsConfig {
+    let mut no_relay_market_config = GravityBridgeToolsConfig::default();
+    no_relay_market_config.relayer.batch_market_enabled = true;
+    no_relay_market_config.relayer.valset_market_enabled = true;
+    no_relay_market_config.relayer.logic_call_market_enabled = false;
+    no_relay_market_config
+}
+
 pub async fn send_eth_to_orchestrators(keys: &[ValidatorKeys], web30: &Web3) {
     let balance = web30.eth_get_balance(*MINER_ADDRESS).await.unwrap();
     info!(
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,11 +28,11 @@ fn default_valset_market_enabled() -> bool { @@
     }
     fn default_batch_market_enabled() -> bool {
-        true
+        false
     }
     fn default_logic_call_market_enabled() -> bool {
-        true
+        false
     }
     impl Default for RelayerConfig {
@@ Expand Down @@