Integrate GlobalConfig to ChainConfig

FuelLabs · Nov 30, 2021 · d3b0af2 · d3b0af2
1 parent c49e1fe
commit d3b0af2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/fuel-core/src/args.rs b/fuel-core/src/args.rs
@@ -1,4 +1,4 @@
-use crate::global_config::GlobalConfig;
+use crate::chain_config::GlobalConfig;
 use crate::service::{Config, DbType};
 use std::{env, io, net, path::PathBuf, string::ToString};
 use structopt::StructOpt;

diff --git a/fuel-core/src/chain_config.rs b/fuel-core/src/chain_config.rs
@@ -19,6 +19,7 @@ pub struct ChainConfig {
     pub parent_network: BaseChainConfig,
     #[serde(default)]
     pub initial_state: Option<StateConfig>,
+    pub global_config: Option<GlobalConfig>,
 }
 
 impl ChainConfig {
@@ -43,6 +44,9 @@ impl ChainConfig {
                 coins: Some(initial_coins),
                 ..StateConfig::default()
             }),
+            global_config: Some(GlobalConfig {
+                vm_backtrace: false,
+            }),
         }
     }
 }
@@ -64,6 +68,12 @@ impl FromStr for ChainConfig {
     }
 }
 
+#[skip_serializing_none]
+#[derive(Clone, Debug, Default, Deserialize, Serialize, PartialEq)]
+pub struct GlobalConfig {
+    pub vm_backtrace: bool,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
 pub enum ProductionStrategy {
     Instant,

diff --git a/fuel-core/src/global_config.rs b/fuel-core/src/global_config.rs
diff --git a/fuel-core/src/lib.rs b/fuel-core/src/lib.rs
@@ -1,7 +1,6 @@
 pub mod chain_config;
 pub mod database;
 pub mod executor;
-pub mod global_config;
 pub mod model;
 pub mod schema;
 pub mod service;

diff --git a/fuel-core/src/main.rs b/fuel-core/src/main.rs
@@ -7,7 +7,6 @@ mod args;
 pub(crate) mod chain_config;
 pub mod database;
 pub(crate) mod executor;
-pub mod global_config;
 pub mod model;
 pub mod schema;
 pub mod service;

diff --git a/fuel-core/src/schema/tx.rs b/fuel-core/src/schema/tx.rs
@@ -1,5 +1,5 @@
+use crate::chain_config::GlobalConfig;
 use crate::database::{transaction::OwnedTransactionIndexCursor, Database, KvStoreError};
-use crate::global_config::GlobalConfig;
 use crate::schema::scalars::{HexString, HexString256};
 use crate::state::IterDirection;
 use crate::tx_pool::TxPool;

diff --git a/fuel-core/src/service.rs b/fuel-core/src/service.rs
@@ -1,6 +1,5 @@
-use crate::chain_config::{ChainConfig, ContractConfig, StateConfig};
+use crate::chain_config::{ChainConfig, ContractConfig, GlobalConfig, StateConfig};
 use crate::database::Database;
-use crate::global_config::GlobalConfig;
 use crate::model::coin::{Coin, CoinStatus, UtxoId};
 use crate::tx_pool::TxPool;
 use fuel_storage::{MerkleStorage, Storage};