From 5e57071484fb7c6758c3ef8c03a843ff03e8c189 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Wed, 26 Feb 2025 00:26:52 +0000 Subject: [PATCH] fix(vm): don't unwrap the version --- vm/rust/src/lib.rs | 3 +-- vm/vm_test.go | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/vm/rust/src/lib.rs b/vm/rust/src/lib.rs index ff65800def..b8d60d63fb 100644 --- a/vm/rust/src/lib.rs +++ b/vm/rust/src/lib.rs @@ -149,8 +149,7 @@ pub extern "C" fn cairoVMCall( let version_constants = get_versioned_constants(block_info.version); let sierra_version_str = unsafe { CStr::from_ptr(sierra_version) }.to_str().unwrap(); - let sierra_version = - SierraVersion::from_str(sierra_version_str).unwrap_or(SierraVersion::DEPRECATED); + let sierra_version = SierraVersion::from_str(sierra_version_str).unwrap(); let initial_gas: u64 = if sierra_version < version_constants.min_sierra_version_for_sierra_gas { version_constants.infinite_gas_for_vm_mode() } else { diff --git a/vm/vm_test.go b/vm/vm_test.go index 5697a908df..0237a1b421 100644 --- a/vm/vm_test.go +++ b/vm/vm_test.go @@ -50,7 +50,7 @@ func TestV0Call(t *testing.T) { ContractAddress: contractAddr, ClassHash: classHash, Selector: entryPoint, - }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Mainnet, 1_000_000, "") + }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Mainnet, 1_000_000, simpleClass.SierraVersion()) require.NoError(t, err) assert.Equal(t, []*felt.Felt{&felt.Zero}, ret.Result) @@ -70,7 +70,7 @@ func TestV0Call(t *testing.T) { ContractAddress: contractAddr, ClassHash: classHash, Selector: entryPoint, - }, &BlockInfo{Header: &core.Header{Number: 1}}, testState, &utils.Mainnet, 1_000_000, "") + }, &BlockInfo{Header: &core.Header{Number: 1}}, testState, &utils.Mainnet, 1_000_000, simpleClass.SierraVersion()) require.NoError(t, err) assert.Equal(t, []*felt.Felt{new(felt.Felt).SetUint64(1337)}, ret.Result) } @@ -117,7 +117,7 @@ func TestV1Call(t *testing.T) { Calldata: []felt.Felt{ *storageLocation, }, - }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Goerli, 1_000_000, "") + }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Goerli, 1_000_000, simpleClass.SierraVersion()) require.NoError(t, err) assert.Equal(t, []*felt.Felt{&felt.Zero}, ret.Result) @@ -139,7 +139,7 @@ func TestV1Call(t *testing.T) { Calldata: []felt.Felt{ *storageLocation, }, - }, &BlockInfo{Header: &core.Header{Number: 1}}, testState, &utils.Goerli, 1_000_000, "") + }, &BlockInfo{Header: &core.Header{Number: 1}}, testState, &utils.Goerli, 1_000_000, simpleClass.SierraVersion()) require.NoError(t, err) assert.Equal(t, []*felt.Felt{new(felt.Felt).SetUint64(37)}, ret.Result) } @@ -179,7 +179,7 @@ func TestCall_MaxSteps(t *testing.T) { ContractAddress: contractAddr, ClassHash: classHash, Selector: entryPoint, - }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Mainnet, 0, "") + }, &BlockInfo{Header: &core.Header{}}, testState, &utils.Mainnet, 0, simpleClass.SierraVersion()) assert.ErrorContains(t, err, "RunResources has no remaining steps") }