propagte errors

Fantom-foundation · Nov 27, 2024 · 3a48143 · 3a48143
1 parent 5273f12
commit 3a48143
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 24 deletions.
diff --git a/go/interpreter/evmone/evmone.go b/go/interpreter/evmone/evmone.go
@@ -16,8 +16,6 @@ package evmone
 import "C"
 
 import (
-	"fmt"
-
 	"github.com/Fantom-foundation/Tosca/go/interpreter/evmc"
 	"github.com/Fantom-foundation/Tosca/go/tosca"
 )
@@ -32,14 +30,14 @@ func init() {
 	tosca.MustRegisterInterpreterFactory("evmone", func(any) (tosca.Interpreter, error) {
 		evmone, err := evmc.LoadEvmcInterpreter("libevmone.so")
 		if err != nil {
-			panic(fmt.Errorf("failed to load evmone library: %s", err))
+			return nil, err
 		}
 		return &evmoneInstance{evmone}, nil
 	})
 	tosca.MustRegisterInterpreterFactory("evmone-basic", func(any) (tosca.Interpreter, error) {
 		evmone, err := evmc.LoadEvmcInterpreter("libevmone.so")
 		if err != nil {
-			panic(fmt.Errorf("failed to load evmone library: %s", err))
+			return nil, err
 		}
 		return &evmoneInstance{evmone}, nil
 	})
@@ -48,10 +46,10 @@ func init() {
 	tosca.MustRegisterInterpreterFactory("evmone-advanced", func(any) (tosca.Interpreter, error) {
 		evmone, err := evmc.LoadEvmcInterpreter("libevmone.so")
 		if err != nil {
-			panic(fmt.Errorf("failed to load evmone library: %s", err))
+			return nil, err
 		}
 		if err := evmone.SetOption("advanced", "on"); err != nil {
-			panic(fmt.Errorf("failed to configure evmone advanced mode: %v", err))
+			return nil, err
 		}
 		return &evmoneInstance{evmone}, nil
 	})

diff --git a/go/interpreter/evmrs/evmrs.go b/go/interpreter/evmrs/evmrs.go
@@ -16,8 +16,6 @@ package evmrs
 import "C"
 
 import (
-	"fmt"
-
 	"github.com/Fantom-foundation/Tosca/go/interpreter/evmc"
 	"github.com/Fantom-foundation/Tosca/go/tosca"
 )
@@ -32,7 +30,7 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmrs", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmrs.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmrs library: %s", err))
+				return nil, err
 			}
 			return &evmrsInstance{evm}, nil
 		})
@@ -42,10 +40,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmrs-logging", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmrs.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmrs library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("logging", "true"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmrsInstance{evm}, nil
 		})

diff --git a/go/interpreter/evmzero/evmzero.go b/go/interpreter/evmzero/evmzero.go
@@ -19,8 +19,6 @@ void evmzero_reset_profiler(void* vm);
 import "C"
 
 import (
-	"fmt"
-
 	"github.com/Fantom-foundation/Tosca/go/interpreter/evmc"
 	"github.com/Fantom-foundation/Tosca/go/tosca"
 )
@@ -35,7 +33,7 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstance{evm}, nil
 		})
@@ -46,10 +44,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero-logging", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("logging", "true"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstance{evm}, nil
 		})
@@ -60,10 +58,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero-no-analysis-cache", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("analysis_cache", "false"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstance{evm}, nil
 		})
@@ -74,10 +72,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero-no-sha3-cache", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("sha3_cache", "false"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstance{evm}, nil
 		})
@@ -88,10 +86,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero-profiling", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("profiling", "true"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstanceWithProfiler{&evmzeroInstance{evm}}, nil
 		})
@@ -102,10 +100,10 @@ func init() {
 		tosca.MustRegisterInterpreterFactory("evmzero-profiling-external", func(any) (tosca.Interpreter, error) {
 			evm, err := evmc.LoadEvmcInterpreter("libevmzero.so")
 			if err != nil {
-				panic(fmt.Errorf("failed to load evmzero library: %s", err))
+				return nil, err
 			}
 			if err = evm.SetOption("profiling_external", "true"); err != nil {
-				panic(fmt.Errorf("failed to configure EVM instance: %s", err))
+				return nil, err
 			}
 			return &evmzeroInstanceWithProfiler{&evmzeroInstance{evm}}, nil
 		})