diff --git a/chain-extensions/types/xvm/src/lib.rs b/chain-extensions/types/xvm/src/lib.rs index 0bc5c57e0a..2c07a855cc 100644 --- a/chain-extensions/types/xvm/src/lib.rs +++ b/chain-extensions/types/xvm/src/lib.rs @@ -38,7 +38,7 @@ impl From for XvmExecutionResult { // `0` is reserved for `Ok` let error_code = match input { InvalidVmId => 1, - SameVmCallNotAllowed => 2, + SameVmCallDenied => 2, InvalidTarget => 3, InputTooLarge => 4, ExceedMaxWeightLimit => 5, diff --git a/pallets/xvm/src/lib.rs b/pallets/xvm/src/lib.rs index cbf204eb75..3de72c4c27 100644 --- a/pallets/xvm/src/lib.rs +++ b/pallets/xvm/src/lib.rs @@ -139,7 +139,7 @@ where ensure!( context.source_vm_id != vm_id, CallErrorWithWeight { - error: CallError::SameVmCallNotAllowed, + error: CallError::SameVmCallDenied, used_weight: overheads, } ); diff --git a/pallets/xvm/src/tests.rs b/pallets/xvm/src/tests.rs index 5419e28bbe..aab851c998 100644 --- a/pallets/xvm/src/tests.rs +++ b/pallets/xvm/src/tests.rs @@ -49,7 +49,7 @@ fn calling_into_same_vm_is_not_allowed() { value ), CallErrorWithWeight { - error: CallError::SameVmCallNotAllowed, + error: CallError::SameVmCallDenied, used_weight: evm_used_weight }, ); @@ -66,7 +66,7 @@ fn calling_into_same_vm_is_not_allowed() { assert_noop!( Xvm::call(wasm_context, wasm_vm_id, ALICE, wasm_target, input, value), CallErrorWithWeight { - error: CallError::SameVmCallNotAllowed, + error: CallError::SameVmCallDenied, used_weight: wasm_used_weight }, ); diff --git a/precompiles/xvm/src/mock.rs b/precompiles/xvm/src/mock.rs index 7115a43467..1812650ce6 100644 --- a/precompiles/xvm/src/mock.rs +++ b/precompiles/xvm/src/mock.rs @@ -249,7 +249,7 @@ impl XvmCall for MockXvmWithArgsCheck { ensure!( vm_id != VmId::Evm, CallErrorWithWeight { - error: SameVmCallNotAllowed, + error: SameVmCallDenied, used_weight: Weight::zero() } ); diff --git a/primitives/src/xvm.rs b/primitives/src/xvm.rs index 072421856d..3d40fe4362 100644 --- a/primitives/src/xvm.rs +++ b/primitives/src/xvm.rs @@ -61,7 +61,7 @@ pub enum CallError { /// Invalid VM id. InvalidVmId, /// Calling the contracts in the same VM is not allowed. - SameVmCallNotAllowed, + SameVmCallDenied, /// Target contract address is invalid. InvalidTarget, /// Input is too large.