Merge pull request #875 from multiversx/vm-cleanup

Vm cleanup
multiversx · Aug 22, 2024 · 27310f3 · 27310f3
2 parents ffe805c + a96ff8c
commit 27310f3
Show file tree

Hide file tree

Showing 41 changed files with 52 additions and 8,207 deletions.
diff --git a/Makefile b/Makefile
@@ -16,14 +16,9 @@ endif
 	cp ./cmd/vmserver/vmserver ${VMSERVER_PATH}
 
 test:
-	go clean -cache -testcache
-	VMEXECUTOR="wasmer1" go test ./...
 	go clean -cache -testcache
 	VMEXECUTOR="wasmer2" go test ./...
 
-test-w1: clean
-	VMEXECUTOR="wasmer1" go test ./...
-
 test-w2: clean
 	VMEXECUTOR="wasmer2" go test ./...
 

diff --git a/cmd/scenariostest/scenariosTest.go b/cmd/scenariostest/scenariosTest.go
@@ -3,9 +3,7 @@ package main
 import (
 	scenclibase "github.com/multiversx/mx-chain-scenario-go/clibase"
 	scenio "github.com/multiversx/mx-chain-scenario-go/scenario/io"
-
 	vmscenario "github.com/multiversx/mx-chain-vm-go/scenario"
-	"github.com/multiversx/mx-chain-vm-go/wasmer"
 	"github.com/multiversx/mx-chain-vm-go/wasmer2"
 	cli "github.com/urfave/cli/v2"
 )
@@ -42,9 +40,6 @@ func (*vm15Flags) ParseFlags(cCtx *cli.Context) scenclibase.CLIRunOptions {
 	}
 
 	vmBuilder := vmscenario.NewScenarioVMHostBuilder()
-	if cCtx.Bool("wasmer1") {
-		vmBuilder.OverrideVMExecutor = wasmer.ExecutorFactory()
-	}
 	if cCtx.Bool("wasmer2") {
 		vmBuilder.OverrideVMExecutor = wasmer2.ExecutorFactory()
 	}

diff --git a/integrationTests/json/scenariosExecutorLogs_test.go b/integrationTests/json/scenariosExecutorLogs_test.go