Cleanup. added VMConfig

fuel-core/src/args.rs

@@ -1,5 +1,4 @@
-use crate::chain_config::GlobalConfig;
-use crate::service::{Config, DbType};
+use crate::service::{Config, DbType,VMConfig};
 use std::{env, io, net, path::PathBuf, string::ToString};
 use structopt::StructOpt;
 use tracing_subscriber::filter::EnvFilter;
@@ -64,7 +63,7 @@ impl Opt {
             database_path,
             database_type,
             chain_conf: chain_config.as_str().parse()?,
-            global_conf: GlobalConfig { vm_backtrace },
+            vm: VMConfig { backtrace: vm_backtrace },
         })
     }
 }

fuel-core/src/chain_config.rs

@@ -64,12 +64,6 @@ 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,

fuel-core/src/schema/tx.rs

@@ -1,4 +1,4 @@
-use crate::chain_config::GlobalConfig;
+use crate::service::Config;
 use crate::database::{transaction::OwnedTransactionIndexCursor, Database, KvStoreError};
 use crate::schema::scalars::{HexString, HexString256};
 use crate::state::IterDirection;
@@ -213,11 +213,11 @@ impl TxMutation {
         tx: HexString,
     ) -> async_graphql::Result<Vec<receipt::Receipt>> {
         let transaction = ctx.data_unchecked::<Database>().transaction();
-        let cfg = ctx.data_unchecked::<GlobalConfig>();
+        let cfg = ctx.data_unchecked::<Config>();
         let tx = FuelTx::from_bytes(&tx.0)?;
         // make virtual txpool from transactional view
         let tx_pool = TxPool::new(transaction.deref().clone());
-        let receipts = tx_pool.run_tx(tx, cfg.vm_backtrace).await?;
+        let receipts = tx_pool.run_tx(tx, cfg.vm.backtrace).await?;
         Ok(receipts.into_iter().map(receipt::Receipt).collect())
     }
 
@@ -228,9 +228,9 @@ impl TxMutation {
         tx: HexString,
     ) -> async_graphql::Result<HexString256> {
         let tx_pool = ctx.data::<Arc<TxPool>>().unwrap();
-        let cfg = ctx.data_unchecked::<GlobalConfig>();
+        let cfg = ctx.data_unchecked::<Config>();
         let tx = FuelTx::from_bytes(&tx.0)?;
-        let id = tx_pool.submit_tx(tx, cfg.vm_backtrace).await?;
+        let id = tx_pool.submit_tx(tx, cfg.vm.backtrace).await?;
 
         Ok(id.into())
     }

fuel-core/src/service.rs

@@ -1,4 +1,4 @@
-use crate::chain_config::{ChainConfig, ContractConfig, GlobalConfig, StateConfig};
+use crate::chain_config::{ChainConfig, ContractConfig, StateConfig};
 use crate::database::Database;
 use crate::model::coin::{Coin, CoinStatus, UtxoId};
 use crate::tx_pool::TxPool;
@@ -26,7 +26,7 @@ pub struct Config {
     pub database_path: PathBuf,
     pub database_type: DbType,
     pub chain_conf: ChainConfig,
-    pub global_conf: GlobalConfig,
+    pub vm: VMConfig,
 }
 
 impl Config {
@@ -36,11 +36,16 @@ impl Config {
             database_path: Default::default(),
             database_type: DbType::InMemory,
             chain_conf: ChainConfig::local_testnet(),
-            global_conf: Default::default(),
+            vm: Default::default(),
         }
     }
 }
 
+#[derive(Clone, Debug,Default)]
+pub struct VMConfig {
+    pub backtrace: bool,
+}
+
 #[derive(Clone, Debug, PartialEq, EnumString, Display)]
 pub enum DbType {
     InMemory,

fuel-core/src/service/graph_api.rs

@@ -32,10 +32,11 @@ pub async fn start_server(
     db: Database,
     tx_pool: Arc<TxPool>,
 ) -> Result<(SocketAddr, JoinHandle<Result<(), crate::service::Error>>), std::io::Error> {
+    let network_addr = config.addr;
     let schema = build_schema()
         .data(db)
         .data(tx_pool)
-        .data(config.global_conf);
+        .data(config);
     let schema = dap::init(schema).finish();
 
     let router = Router::new()
@@ -58,7 +59,7 @@ pub async fn start_server(
         .boxed();
 
     let (tx, rx) = tokio::sync::oneshot::channel();
-    let listener = TcpListener::bind(&config.addr)?;
+    let listener = TcpListener::bind(&network_addr)?;
     let bound_addr = listener.local_addr().unwrap();
 
     info!("Binding GraphQL provider to {}", bound_addr);