starknet layout

NethermindEth · Sep 5, 2024 · a42d0da · a42d0da
1 parent 3618459
commit a42d0da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/integration_tests/cairozero_test.go b/integration_tests/cairozero_test.go
@@ -288,6 +288,8 @@ func runPythonVm(testFilename, path string) (time.Duration, string, string, erro
 	// A file without this suffix will use the default ("plain") layout.
 	if strings.HasSuffix(testFilename, ".small.cairo") {
 		args = append(args, "--layout", "small")
+	} else if strings.HasSuffix(testFilename, ".starknet_without_keccak.cairo") {
+		args = append(args, "--layout", "starknet")
 	} else if strings.HasSuffix(testFilename, ".starknet_with_keccak.cairo") {
 		args = append(args, "--layout", "starknet_with_keccak")
 	}
@@ -321,6 +323,8 @@ func runVm(path string) (time.Duration, string, string, string, error) {
 	layout := "plain"
 	if strings.Contains(path, ".small") {
 		layout = "small"
+	} else if strings.Contains(path, ".starknet_without_keccak") {
+		layout = "starknet"
 	} else if strings.Contains(path, ".starknet_with_keccak") {
 		layout = "starknet_with_keccak"
 	}

diff --git a/pkg/vm/builtins/layouts.go b/pkg/vm/builtins/layouts.go
@@ -45,7 +45,6 @@ func getStarknetLayout() Layout {
 		{Runner: &ECDSA{ratio: 2048}, Builtin: starknet.ECDSA},
 		{Runner: &Bitwise{ratio: 64}, Builtin: starknet.Bitwise},
 		{Runner: &EcOp{ratio: 1024, cache: make(map[uint64]fp.Element)}, Builtin: starknet.ECOP},
-		{Runner: &Keccak{ratio: 2048, cache: make(map[uint64]fp.Element)}, Builtin: starknet.Keccak},
 		{Runner: &Poseidon{ratio: 32, cache: make(map[uint64]fp.Element)}, Builtin: starknet.Poseidon},
 	}}
 }