Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions rs/execution_environment/src/canister_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1686,11 +1686,10 @@ impl CanisterManager {
if self.config.rate_limiting_of_heap_delta == FlagStatus::Enabled
&& canister.scheduler_state.heap_delta_debit >= self.config.heap_delta_rate_limit
{
return Err(CanisterManagerError::WasmChunkStoreError {
message: format!(
"Canister is heap delta rate limited. Current delta debit: {}, limit: {}",
canister.scheduler_state.heap_delta_debit, self.config.heap_delta_rate_limit
),
return Err(CanisterManagerError::CanisterHeapDeltaRateLimited {
canister_id: canister.canister_id(),
value: canister.scheduler_state.heap_delta_debit,
limit: self.config.heap_delta_rate_limit,
});
}

Expand Down Expand Up @@ -2851,11 +2850,10 @@ impl CanisterManager {
if self.config.rate_limiting_of_heap_delta == FlagStatus::Enabled
&& canister.scheduler_state.heap_delta_debit >= self.config.heap_delta_rate_limit
{
return Err(CanisterManagerError::WasmChunkStoreError {
message: format!(
"Canister is heap delta rate limited. Current delta debit: {}, limit: {}",
canister.scheduler_state.heap_delta_debit, self.config.heap_delta_rate_limit
),
return Err(CanisterManagerError::CanisterHeapDeltaRateLimited {
canister_id: canister.canister_id(),
value: canister.scheduler_state.heap_delta_debit,
limit: self.config.heap_delta_rate_limit,
});
}

Expand Down
5 changes: 2 additions & 3 deletions rs/execution_environment/src/canister_manager/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5341,9 +5341,8 @@ fn upload_chunk_fails_when_heap_delta_rate_limited() {
test.subnet_message("upload_chunk", upload_args.encode())
.unwrap_err()
.assert_contains(
ErrorCode::CanisterContractViolation,
"Error from Wasm chunk store: Canister is heap delta rate limited. \
Current delta debit: 1048576, limit: 1048576.",
ErrorCode::CanisterHeapDeltaRateLimited,
&format!("Canister {canister_id} is heap delta rate limited: current delta debit is 1048576, but limit is 1048576")
);

assert_eq!(
Expand Down
Loading