Merge pull request #3151 from ElrondNetwork/remove-arwen-oop

Removed Arwen OOP option
multiversx · Jun 8, 2021 · 9aaa53b · 9aaa53b
2 parents 4bc1f0d + 5500605
commit 9aaa53b
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 189 deletions.
diff --git a/Makefile b/Makefile
@@ -74,6 +74,7 @@ benchmark-arwen:
 	go test -v -count=1 -test.bench 'Benchmark_VmDeployWithCPUCalculateAndExecute' -test.run='noruns' ./integrationTests/vm/arwen
 	go test -v -count=1 -test.bench 'Benchmark_VmDeployWithStringConcatAndExecute' -test.run='noruns' ./integrationTests/vm/arwen
 
+#TODO: this is no longer required should be removed in a subsequent PR
 arwen:
 ifndef ARWEN_PATH
 	$(error ARWEN_PATH is undefined)

diff --git a/cmd/assessment/benchmarks/erc20Benchmark.go b/cmd/assessment/benchmarks/erc20Benchmark.go
@@ -48,7 +48,6 @@ func (eb *erc20Benchmark) Run() (time.Duration, error) {
 		createTestGasMap(),
 		eb.scFilename,
 		eb.function,
-		false,
 	)
 	if err != nil {
 		return 0, err

diff --git a/cmd/node/config/config.toml b/cmd/node/config/config.toml
@@ -640,38 +640,29 @@
 
 [VirtualMachine]
     [VirtualMachine.Execution]
-        OutOfProcessEnabled = true
         ArwenVersions = [
-            { StartEpoch = 0, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 3, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 4, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 5, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 6, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 7, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 8, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 9, Version = "v1.3", OutOfProcessSupported = false },
+            { StartEpoch = 0, Version = "v1.2" },
+            { StartEpoch = 3, Version = "v1.3" },
+            { StartEpoch = 4, Version = "v1.2" },
+            { StartEpoch = 5, Version = "v1.3" },
+            { StartEpoch = 6, Version = "v1.2" },
+            { StartEpoch = 7, Version = "v1.3" },
+            { StartEpoch = 8, Version = "v1.2" },
+            { StartEpoch = 9, Version = "v1.3" },
         ]
-        [VirtualMachine.Execution.OutOfProcessConfig]
-            LogsMarshalizer = "json"
-            MessagesMarshalizer = "json"
-            MaxLoopTime = 1000
+
     [VirtualMachine.Querying]
         NumConcurrentVMs = 1
-        OutOfProcessEnabled = true
         ArwenVersions = [
-            { StartEpoch = 0, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 3, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 4, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 5, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 6, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 7, Version = "v1.3", OutOfProcessSupported = false },
-            { StartEpoch = 8, Version = "v1.2", OutOfProcessSupported = false },
-            { StartEpoch = 9, Version = "v1.3", OutOfProcessSupported = false },
+            { StartEpoch = 0, Version = "v1.2" },
+            { StartEpoch = 3, Version = "v1.3" },
+            { StartEpoch = 4, Version = "v1.2" },
+            { StartEpoch = 5, Version = "v1.3" },
+            { StartEpoch = 6, Version = "v1.2" },
+            { StartEpoch = 7, Version = "v1.3" },
+            { StartEpoch = 8, Version = "v1.2" },
+            { StartEpoch = 9, Version = "v1.3" },
         ]
-        [VirtualMachine.Querying.OutOfProcessConfig]
-            LogsMarshalizer = "json"
-            MessagesMarshalizer = "json"
-            MaxLoopTime = 10000
 
 [Hardfork]
     EnableTrigger = true

diff --git a/cmd/node/factory/structs.go b/cmd/node/factory/structs.go
@@ -1309,7 +1309,6 @@ func generateGenesisHeadersAndApplyInitialBalances(args *processComponentsFactor
 	economicsData := args.economicsData
 
 	genesisVmConfig := args.mainConfig.VirtualMachine.Execution
-	genesisVmConfig.OutOfProcessConfig.MaxLoopTime = 5000 // 5 seconds
 
 	arg := genesisProcess.ArgsGenesisBlockCreator{
 		GenesisTime:              uint64(nodesSetup.StartTime),

diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -1884,9 +1884,9 @@ func createShardCoordinator(
 			return nil, "", err
 		}
 		if selfShardId == core.DisabledShardIDAsObserver {
-			pubKeyBytes, err := pubKey.ToByteArray()
-			if err != nil {
-				return nil, core.NodeTypeObserver, fmt.Errorf("%w while assigning random shard ID for observer", err)
+			pubKeyBytes, errConvert := pubKey.ToByteArray()
+			if errConvert != nil {
+				return nil, core.NodeTypeObserver, fmt.Errorf("%w while assigning random shard ID for observer", errConvert)
 			}
 
 			selfShardId = core.AssignShardForPubKeyWhenNotSpecified(pubKeyBytes, nodesConfig.NumberOfShards())
@@ -1935,9 +1935,9 @@ func createNodesCoordinator(
 		return nil, nil, err
 	}
 	if shardIDAsObserver == core.DisabledShardIDAsObserver {
-		pubKeyBytes, err := pubKey.ToByteArray()
-		if err != nil {
-			return nil, nil, fmt.Errorf("%w while assigning random shard ID for observer", err)
+		pubKeyBytes, errConvert := pubKey.ToByteArray()
+		if errConvert != nil {
+			return nil, nil, fmt.Errorf("%w while assigning random shard ID for observer", errConvert)
 		}
 
 		shardIDAsObserver = core.AssignShardForPubKeyWhenNotSpecified(pubKeyBytes, nodesConfig.NumberOfShards())
@@ -2759,7 +2759,6 @@ func createScQueryElement(
 		}
 	} else {
 		queryVirtualMachineConfig := generalConfig.VirtualMachine.Querying.VirtualMachineConfig
-		queryVirtualMachineConfig.OutOfProcessEnabled = true
 		argsNewVMFactory := shard.ArgVMContainerFactory{
 			Config:                         queryVirtualMachineConfig,
 			BlockGasLimit:                  economics.MaxGasLimitPerBlock(shardCoordinator.SelfId()),

diff --git a/config/config.go b/config/config.go
@@ -347,16 +347,13 @@ type VirtualMachineServicesConfig struct {
 
 // VirtualMachineConfig holds configuration for a Virtual Machine service
 type VirtualMachineConfig struct {
-	OutOfProcessConfig  VirtualMachineOutOfProcessConfig
-	OutOfProcessEnabled bool
-	ArwenVersions       []ArwenVersionByEpoch
+	ArwenVersions []ArwenVersionByEpoch
 }
 
 // ArwenVersionByEpoch represents the Arwen version to be used starting with an epoch
 type ArwenVersionByEpoch struct {
-	StartEpoch            uint32
-	OutOfProcessSupported bool
-	Version               string
+	StartEpoch uint32
+	Version    string
 }
 
 // QueryVirtualMachineConfig holds the configuration for the virtual machine(s) used in query process
@@ -365,13 +362,6 @@ type QueryVirtualMachineConfig struct {
 	NumConcurrentVMs int
 }
 
-// VirtualMachineOutOfProcessConfig holds configuration for out-of-process virtual machine(s)
-type VirtualMachineOutOfProcessConfig struct {
-	LogsMarshalizer     string
-	MessagesMarshalizer string
-	MaxLoopTime         int
-}
-
 // HardforkConfig holds the configuration for the hardfork trigger
 type HardforkConfig struct {
 	ExportStateStorageConfig     StorageConfig

diff --git a/config/tomlConfig_test.go b/config/tomlConfig_test.go
@@ -39,15 +39,9 @@ func TestTomlParser(t *testing.T) {
 	consensusType := "bls"
 
 	vmConfig := VirtualMachineConfig{
-		OutOfProcessEnabled: false,
-		OutOfProcessConfig: VirtualMachineOutOfProcessConfig{
-			LogsMarshalizer:     "json",
-			MessagesMarshalizer: "json",
-			MaxLoopTime:         1000,
-		},
 		ArwenVersions: []ArwenVersionByEpoch{
-			{StartEpoch: 12, Version: "v0.3", OutOfProcessSupported: true},
-			{StartEpoch: 88, Version: "v1.2", OutOfProcessSupported: false},
+			{StartEpoch: 12, Version: "v0.3"},
+			{StartEpoch: 88, Version: "v1.2"},
 		},
 	}
 	cfgExpected := Config{
@@ -103,7 +97,6 @@ func TestTomlParser(t *testing.T) {
 			},
 		},
 	}
-	cfgExpected.VirtualMachine.Querying.OutOfProcessEnabled = true
 	testString := `
 [MiniBlocksStorage]
     [MiniBlocksStorage.Cache]
@@ -149,26 +142,17 @@ func TestTomlParser(t *testing.T) {
 
 [VirtualMachine]
     [VirtualMachine.Execution]
-        OutOfProcessEnabled = false
         ArwenVersions = [
-            { StartEpoch = 12, Version = "v0.3", OutOfProcessSupported = true},
-            { StartEpoch = 88, Version = "v1.2", OutOfProcessSupported = false},
+            { StartEpoch = 12, Version = "v0.3" },
+            { StartEpoch = 88, Version = "v1.2" },
         ]
-        [VirtualMachine.Execution.OutOfProcessConfig]
-            LogsMarshalizer = "json"
-            MessagesMarshalizer = "json"
-            MaxLoopTime = 1000
+        
     [VirtualMachine.Querying]
         NumConcurrentVMs = 16
-        OutOfProcessEnabled = true
         ArwenVersions = [
-            { StartEpoch = 12, Version = "v0.3", OutOfProcessSupported = true},
-            { StartEpoch = 88, Version = "v1.2", OutOfProcessSupported = false},
+            { StartEpoch = 12, Version = "v0.3" },
+            { StartEpoch = 88, Version = "v1.2" },
         ]
-        [VirtualMachine.Querying.OutOfProcessConfig]
-            LogsMarshalizer = "json"
-            MessagesMarshalizer = "json"
-            MaxLoopTime = 1000
 
 `
 	cfg := Config{}

diff --git a/genesis/process/genesisBlockCreator_test.go b/genesis/process/genesisBlockCreator_test.go
@@ -62,10 +62,8 @@ func createMockArgument(
 		DataPool:                 testscommon.NewPoolsHolderMock(),
 		TxLogsProcessor:          &mock.TxLogProcessorMock{},
 		VirtualMachineConfig: config.VirtualMachineConfig{
-			OutOfProcessEnabled: true,
-			OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 			ArwenVersions: []config.ArwenVersionByEpoch{
-				{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+				{StartEpoch: 0, Version: "*"},
 			},
 		},
 		HardForkConfig: config.HardforkConfig{},

diff --git a/integrationTests/multiShard/hardFork/hardFork_test.go b/integrationTests/multiShard/hardFork/hardFork_test.go
@@ -413,10 +413,8 @@ func hardForkImport(
 			GasSchedule:              mock.NewGasScheduleNotifierMock(gasSchedule),
 			TxLogsProcessor:          &mock.TxLogsProcessorStub{},
 			VirtualMachineConfig: config.VirtualMachineConfig{
-				OutOfProcessEnabled: true,
-				OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 				ArwenVersions: []config.ArwenVersionByEpoch{
-					{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+					{StartEpoch: 0, Version: "*"},
 				},
 			},
 			HardForkConfig: config.HardforkConfig{

diff --git a/integrationTests/testInitializer.go b/integrationTests/testInitializer.go
@@ -543,10 +543,8 @@ func CreateFullGenesisBlocks(
 		GasSchedule:              mock.NewGasScheduleNotifierMock(gasSchedule),
 		TxLogsProcessor:          &mock.TxLogsProcessorStub{},
 		VirtualMachineConfig: config.VirtualMachineConfig{
-			OutOfProcessEnabled: true,
-			OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 			ArwenVersions: []config.ArwenVersionByEpoch{
-				{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+				{StartEpoch: 0, Version: "*"},
 			},
 		},
 		TrieStorageManagers: trieStorageManagers,
@@ -648,10 +646,8 @@ func CreateGenesisMetaBlock(
 		GasSchedule:              mock.NewGasScheduleNotifierMock(gasSchedule),
 		TxLogsProcessor:          &mock.TxLogsProcessorStub{},
 		VirtualMachineConfig: config.VirtualMachineConfig{
-			OutOfProcessEnabled: true,
-			OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 			ArwenVersions: []config.ArwenVersionByEpoch{
-				{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+				{StartEpoch: 0, Version: "*"},
 			},
 		},
 		HardForkConfig: config.HardforkConfig{},

diff --git a/integrationTests/testProcessorNode.go b/integrationTests/testProcessorNode.go
@@ -835,10 +835,8 @@ func (tpn *TestProcessorNode) createFullSCQueryService() {
 	} else {
 		argsNewVMFactory := shard.ArgVMContainerFactory{
 			Config: config.VirtualMachineConfig{
-				OutOfProcessEnabled: true,
-				OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 				ArwenVersions: []config.ArwenVersionByEpoch{
-					{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+					{StartEpoch: 0, Version: "*"},
 				},
 			},
 			BlockGasLimit:                  tpn.EconomicsData.MaxGasLimitPerBlock(tpn.ShardCoordinator.SelfId()),
@@ -1311,10 +1309,8 @@ func (tpn *TestProcessorNode) initInnerProcessors(gasMap map[string]map[string]u
 	maxGasLimitPerBlock := uint64(0xFFFFFFFFFFFFFFFF)
 	argsNewVMFactory := shard.ArgVMContainerFactory{
 		Config: config.VirtualMachineConfig{
-			OutOfProcessEnabled: false,
-			OutOfProcessConfig:  config.VirtualMachineOutOfProcessConfig{MaxLoopTime: 999},
 			ArwenVersions: []config.ArwenVersionByEpoch{
-				{StartEpoch: 0, OutOfProcessSupported: false, Version: "*"},
+				{StartEpoch: 0, Version: "*"},
 			},
 		},
 		BlockGasLimit:                  maxGasLimitPerBlock,

diff --git a/integrationTests/vm/arwen/arwenVM/arwenVM_test.go b/integrationTests/vm/arwen/arwenVM/arwenVM_test.go
@@ -303,11 +303,11 @@ func TestMultipleTimesERC20BigIntInBatches(t *testing.T) {
 	}
 
 	gasSchedule, _ := core.LoadGasScheduleConfig("../../../../cmd/node/config/gasSchedules/gasScheduleV2.toml")
-	durations, err := DeployAndExecuteERC20WithBigInt(3, 1000, gasSchedule, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken", false)
+	durations, err := DeployAndExecuteERC20WithBigInt(3, 1000, gasSchedule, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken")
 	require.Nil(t, err)
 	displayBenchmarksResults(durations)
 
-	durations, err = DeployAndExecuteERC20WithBigInt(3, 1000, nil, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken", true)
+	durations, err = DeployAndExecuteERC20WithBigInt(3, 1000, nil, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken")
 	require.Nil(t, err)
 	displayBenchmarksResults(durations)
 }
@@ -317,11 +317,11 @@ func TestMultipleTimesERC20RustBigIntInBatches(t *testing.T) {
 		t.Skip("this is not a short test")
 	}
 	gasSchedule, _ := core.LoadGasScheduleConfig("../../../../cmd/node/config/gasSchedules/gasScheduleV2.toml")
-	durations, err := DeployAndExecuteERC20WithBigInt(3, 1000, gasSchedule, "../testdata/erc20-c-03/rust-simple-erc20.wasm", "transfer", false)
+	durations, err := DeployAndExecuteERC20WithBigInt(3, 1000, gasSchedule, "../testdata/erc20-c-03/rust-simple-erc20.wasm", "transfer")
 	require.Nil(t, err)
 	displayBenchmarksResults(durations)
 
-	durations, err = DeployAndExecuteERC20WithBigInt(3, 1000, nil, "../testdata/erc20-c-03/rust-simple-erc20.wasm", "transfer", true)
+	durations, err = DeployAndExecuteERC20WithBigInt(3, 1000, nil, "../testdata/erc20-c-03/rust-simple-erc20.wasm", "transfer")
 	require.Nil(t, err)
 	displayBenchmarksResults(durations)
 }
@@ -367,7 +367,6 @@ func TestDeployERC20WithNotEnoughGasShouldReturnOutOfGas(t *testing.T) {
 		ownerAddressBytes,
 		ownerBalance,
 		gasSchedule,
-		false,
 		vm.ArgEnableEpoch{},
 	)
 	require.Nil(t, err)
@@ -407,7 +406,6 @@ func TestJournalizingAndTimeToProcessChange(t *testing.T) {
 		ownerAddressBytes,
 		ownerBalance,
 		nil,
-		false,
 		vm.ArgEnableEpoch{},
 	)
 	require.Nil(t, err)
@@ -614,7 +612,6 @@ func TestAndCatchTrieError(t *testing.T) {
 		ownerAddressBytes,
 		ownerBalance,
 		nil,
-		false,
 		vm.ArgEnableEpoch{},
 	)
 	require.Nil(t, err)

diff --git a/integrationTests/vm/arwen/arwenVM/gasSchedule_test.go b/integrationTests/vm/arwen/arwenVM/gasSchedule_test.go
@@ -127,7 +127,7 @@ func TestGasModel(t *testing.T) {
 	}
 	fmt.Println("gasSchedule: " + big.NewInt(int64(totalOp)).String())
 	fmt.Println("ERC20 BIGINT")
-	durations, err := DeployAndExecuteERC20WithBigInt(1, 100, gasSchedule, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken", false)
+	durations, err := DeployAndExecuteERC20WithBigInt(1, 100, gasSchedule, "../testdata/erc20-c-03/wrc20_arwen.wasm", "transferToken")
 	require.Nil(t, err)
 	displayBenchmarksResults(durations)
 

diff --git a/integrationTests/vm/arwen/arwenVM/testRunner.go b/integrationTests/vm/arwen/arwenVM/testRunner.go
@@ -55,7 +55,6 @@ func RunTest(
 		ownerAddressBytes,
 		ownerBalance,
 		gasSchedule,
-		false,
 		vm.ArgEnableEpoch{},
 	)
 	if err != nil {
@@ -125,7 +124,6 @@ func DeployAndExecuteERC20WithBigInt(
 	gasSchedule map[string]map[string]uint64,
 	fileName string,
 	functionName string,
-	outOfProcess bool,
 ) ([]time.Duration, error) {
 	ownerAddressBytes := []byte("12345678901234567890123456789011")
 	ownerNonce := uint64(11)
@@ -140,7 +138,6 @@ func DeployAndExecuteERC20WithBigInt(
 		ownerAddressBytes,
 		ownerBalance,
 		gasSchedule,
-		outOfProcess,
 		vm.ArgEnableEpoch{},
 	)
 	if err != nil {