diff --git a/lib/core/conf/src/global_conf/v2.rs b/lib/core/conf/src/global_conf/v2.rs index c4c7dd9b52e8ce76fe100a55e40fa009497e544e..a9535fe06397e3805ec664b0615fefb3ae468635 100644 --- a/lib/core/conf/src/global_conf/v2.rs +++ b/lib/core/conf/src/global_conf/v2.rs @@ -32,7 +32,7 @@ pub struct DuRsGlobalUserConfV2 { /// Name of the module used by default for synchronization pub default_sync_module: Option<ModuleName>, /// Ressources usage - pub ressources_usage: Option<ResourcesUsage>, + pub resources_usage: Option<ResourcesUsage>, /// Disabled modules pub disabled: Option<HashSet<ModuleName>>, /// Enabled modules @@ -49,7 +49,7 @@ pub struct DuRsGlobalConfV2 { /// Name of the module used by default for synchronization pub default_sync_module: ModuleName, /// Ressources usage - pub ressources_usage: ResourcesUsage, + pub resources_usage: ResourcesUsage, /// Disabled modules pub disabled: HashSet<ModuleName>, /// Enabled modules @@ -62,7 +62,7 @@ impl Default for DuRsGlobalConfV2 { currency: CurrencyName(String::from(constants::DEFAULT_CURRENCY)), my_node_id: crate::generate_random_node_id(), default_sync_module: ModuleName(String::from(constants::DEFAULT_DEFAULT_SYNC_MODULE)), - ressources_usage: ResourcesUsage::default(), + resources_usage: ResourcesUsage::default(), disabled: HashSet::with_capacity(0), enabled: HashSet::with_capacity(0), } @@ -75,7 +75,7 @@ impl From<DuRsConfV1> for DuRsGlobalConfV2 { currency: conf_v1.currency, my_node_id: conf_v1.my_node_id, default_sync_module: ModuleName(String::from(constants::DEFAULT_DEFAULT_SYNC_MODULE)), - ressources_usage: ResourcesUsage::default(), + resources_usage: ResourcesUsage::default(), disabled: conf_v1.disabled, enabled: conf_v1.enabled, } @@ -91,9 +91,9 @@ impl DuRsGlobalConfV2 { default_sync_module: global_user_conf .default_sync_module .unwrap_or(self.default_sync_module), - ressources_usage: global_user_conf - .ressources_usage - .unwrap_or(self.ressources_usage), + resources_usage: global_user_conf + .resources_usage + .unwrap_or(self.resources_usage), disabled: global_user_conf.disabled.unwrap_or(self.disabled), enabled: global_user_conf.enabled.unwrap_or(self.enabled), } diff --git a/lib/core/conf/test/v1/conf-upgraded.json b/lib/core/conf/test/v1/conf-upgraded.json index 2614b3bf852f20c74160ee7d672d177a18001007..1ac7a1f9f8748d49f2fc00d6d9d98f26afc7b454 100644 --- a/lib/core/conf/test/v1/conf-upgraded.json +++ b/lib/core/conf/test/v1/conf-upgraded.json @@ -4,7 +4,7 @@ "currency": "g1", "my_node_id": 1191678020, "default_sync_module": "ws2p1", - "ressources_usage": { + "resources_usage": { "cpu_usage": "Large", "network_usage": "Large", "memory_usage": "Large", diff --git a/lib/core/conf/test/v1/conf.json b/lib/core/conf/test/v1/conf.json index 2614b3bf852f20c74160ee7d672d177a18001007..1ac7a1f9f8748d49f2fc00d6d9d98f26afc7b454 100644 --- a/lib/core/conf/test/v1/conf.json +++ b/lib/core/conf/test/v1/conf.json @@ -4,7 +4,7 @@ "currency": "g1", "my_node_id": 1191678020, "default_sync_module": "ws2p1", - "ressources_usage": { + "resources_usage": { "cpu_usage": "Large", "network_usage": "Large", "memory_usage": "Large", diff --git a/lib/core/conf/test/v2/conf.json b/lib/core/conf/test/v2/conf.json index c586e6aa9088c0999d65ccc7fcb578d23ccc8175..c80ab0a9f2da2b96ba433f35d7fcc0cbea097ed7 100644 --- a/lib/core/conf/test/v2/conf.json +++ b/lib/core/conf/test/v2/conf.json @@ -4,7 +4,7 @@ "currency":"g1", "my_node_id": 1191678020, "default_sync_module": "ws2pv1", - "ressources_usage": { + "resources_usage": { "cpu_usage": "Large", "network_usage": "Large", "memory_usage": "Large",