From e8a28dbf8e615726afcd5482510027d2ef73dae2 Mon Sep 17 00:00:00 2001 From: Emir Salkic Date: Tue, 10 Oct 2023 15:40:32 +0200 Subject: [PATCH] refactoring --- packages/fuels-test-helpers/src/fuel_bin_service.rs | 6 +++--- packages/fuels-test-helpers/src/node_types.rs | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/fuels-test-helpers/src/fuel_bin_service.rs b/packages/fuels-test-helpers/src/fuel_bin_service.rs index d6db10207c..e307fd35cb 100644 --- a/packages/fuels-test-helpers/src/fuel_bin_service.rs +++ b/packages/fuels-test-helpers/src/fuel_bin_service.rs @@ -8,7 +8,7 @@ use fuel_core_services::Service as ServiceTrait; use fuel_core_client::client::FuelClient; use std::{net::SocketAddr, path::PathBuf, pin::Pin, time::Duration}; -use crate::node_types::{Config, DbType, Trigger, DEFAULT_CACHE_SIZE}; +use crate::node_types::{Config, DbType, Trigger}; use portpicker::{is_free, pick_unused_port}; use tokio::{process::Command, spawn, task::JoinHandle, time::sleep}; @@ -51,9 +51,9 @@ impl ExtendedConfig { } } - if self.config.max_database_cache_size != DEFAULT_CACHE_SIZE { + if let Some(cache_size) = self.config.max_database_cache_size { args.push("--max-database-cache-size".to_string()); - args.push(self.config.max_database_cache_size.to_string()); + args.push(cache_size.to_string()); } if self.config.utxo_validation { diff --git a/packages/fuels-test-helpers/src/node_types.rs b/packages/fuels-test-helpers/src/node_types.rs index 1b5fc5b02a..efb3a652ee 100644 --- a/packages/fuels-test-helpers/src/node_types.rs +++ b/packages/fuels-test-helpers/src/node_types.rs @@ -14,8 +14,6 @@ use serde::{de::Error as SerdeError, Deserializer, Serializer}; use serde_with::{DeserializeAs, SerializeAs}; -pub const DEFAULT_CACHE_SIZE: usize = 10 * 1024 * 1024; - #[derive(Clone, Debug)] pub enum Trigger { Instant, @@ -61,7 +59,7 @@ impl From for fuel_core::service::DbType { #[derive(Clone, Debug)] pub struct Config { pub addr: SocketAddr, - pub max_database_cache_size: usize, + pub max_database_cache_size: Option, pub database_type: DbType, pub utxo_validation: bool, pub manual_blocks_enabled: bool, @@ -75,7 +73,7 @@ impl Config { pub fn local_node() -> Self { Self { addr: SocketAddr::new(Ipv4Addr::new(127, 0, 0, 1).into(), 0), - max_database_cache_size: DEFAULT_CACHE_SIZE, + max_database_cache_size: Some(10 * 1024 * 1024), database_type: DbType::InMemory, utxo_validation: false, manual_blocks_enabled: false, @@ -91,7 +89,7 @@ impl Default for Config { fn default() -> Self { Self { addr: SocketAddr::new(Ipv4Addr::new(127, 0, 0, 1).into(), 0), - max_database_cache_size: DEFAULT_CACHE_SIZE, + max_database_cache_size: Some(10 * 1024 * 1024), database_type: DbType::InMemory, utxo_validation: false, manual_blocks_enabled: false, @@ -108,7 +106,7 @@ impl From for fuel_core::service::Config { fn from(value: Config) -> Self { Self { addr: value.addr, - max_database_cache_size: value.max_database_cache_size, + max_database_cache_size: value.max_database_cache_size.unwrap_or(10 * 1024 * 1024), database_path: match &value.database_type { DbType::InMemory => Default::default(), DbType::RocksDb(path) => path.clone().unwrap_or_default(),