From 5466799a0f9b5800dbe0c974e7ca453983b44536 Mon Sep 17 00:00:00 2001 From: Dragoljub Duric Date: Fri, 7 Feb 2025 16:31:26 +0000 Subject: [PATCH] . --- rs/execution_environment/src/canister_settings.rs | 10 ---------- .../integration_tests/src/update_canister_settings.rs | 1 - 2 files changed, 11 deletions(-) diff --git a/rs/execution_environment/src/canister_settings.rs b/rs/execution_environment/src/canister_settings.rs index bd3631caa3b..d793c68d210 100644 --- a/rs/execution_environment/src/canister_settings.rs +++ b/rs/execution_environment/src/canister_settings.rs @@ -484,16 +484,6 @@ pub(crate) fn validate_canister_settings( } } - if let Some(wasm_memory_limit) = settings.wasm_memory_limit() { - if let Some(wasm_memory_threshold) = settings.wasm_memory_threshold() { - if wasm_memory_threshold > wasm_memory_limit { - return Err(CanisterManagerError::InvalidSettings { - message: format!("Invalid settings: 'wasm_memory_threshold' cannot be larger than 'wasm_memory_limit'. 'wasm_memory_threshold': {}, 'wasm_memory_limit': {}", wasm_memory_threshold, wasm_memory_limit), - }); - } - } - } - let new_memory_allocation = settings .memory_allocation .unwrap_or(canister_memory_allocation); diff --git a/rs/nns/integration_tests/src/update_canister_settings.rs b/rs/nns/integration_tests/src/update_canister_settings.rs index 5bb879388dc..37d937e3152 100644 --- a/rs/nns/integration_tests/src/update_canister_settings.rs +++ b/rs/nns/integration_tests/src/update_canister_settings.rs @@ -36,7 +36,6 @@ fn test_update_canister_settings_proposal( let target_memory_allocation = 1u64 << 33; let target_compute_allocation = 10u64; let target_freezing_threshold = 100_000u64; - // `target_wasm_memory_limit` needs to be larger than `target_wasm_memory_threshold`. let target_wasm_memory_limit = 1u64 << 36; let target_wasm_memory_threshold = 1u64 << 34; let target_log_visibility = Some(LogVisibility::Public);