fixup

gnolang · Dec 11, 2024 · 224e164 · 224e164
1 parent e0b4ba0
commit 224e164
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/gno.land/cmd/gnoland/testdata/addpkg_outofgas.txtar b/gno.land/cmd/gnoland/testdata/addpkg_outofgas.txtar
@@ -7,17 +7,12 @@ gnoland start
 gnokey maketx addpkg -pkgdir $WORK/foo -pkgpath gno.land/r/foo -gas-fee 1000000ugnot -gas-wanted 220000 -broadcast -chainid=tendermint_test test1
 
 
-# add bar package
-# out of gas at store.GetPackage() with gas 60000
+# add bar package - out of gas at store.GetPackage() with gas 60000
 
 ! gnokey maketx addpkg -pkgdir $WORK/bar -pkgpath gno.land/r/bar -gas-fee 1000000ugnot -gas-wanted 60000 -broadcast -chainid=tendermint_test test1
 
-# Out of gas error
-
 stderr '--= Error =--'
 stderr 'Data: out of gas error'
-stderr 'Msg Traces:'
-stderr 'out of gas.*?in preprocess'
 stderr '--= /Error =--'
 
 
@@ -28,8 +23,6 @@ stderr '--= /Error =--'
 
 stderr '--= Error =--'
 stderr 'Data: out of gas error'
-stderr 'Msg Traces:'
-stderr 'out of gas.*?in preprocess'
 stderr '--= /Error =--'
 
 

diff --git a/gno.land/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go
@@ -511,8 +511,8 @@ func (vm *VMKeeper) Call(ctx sdk.Context, msg MsgCall) (res string, err error) {
 
 func doRecover(m *gno.Machine, e *error) {
 	if r := recover(); r != nil {
-		if err := r.(error); r != nil {
-			oog := new(types.OutOfGasError)
+		if err, ok := r.(error); ok {
+			var oog types.OutOfGasError
 			if goerrors.As(err, &oog) {
 				// Re-panic and don't wrap.
 				panic(oog)
@@ -521,7 +521,7 @@ func doRecover(m *gno.Machine, e *error) {
 			if goerrors.As(err, &up) {
 				// Common unhandled panic error, skip machine state.
 				*e = errors.Wrapf(
-					up.Descriptor,
+					errors.New(up.Descriptor),
 					"VM panic: %s\nStacktrace: %s\n",
 					up.Descriptor, m.ExceptionsStacktrace(),
 				)

diff --git a/tm2/pkg/store/types/gas.go b/tm2/pkg/store/types/gas.go
@@ -26,7 +26,7 @@ type OutOfGasError struct {
 	Descriptor string
 }
 
-func (oog *OutOfGasError) Error() string {
+func (oog OutOfGasError) Error() string {
 	return "out of gas in location: " + oog.Descriptor
 }
 
@@ -36,7 +36,7 @@ type GasOverflowError struct {
 	Descriptor string
 }
 
-func (oog *GasOverflowError) Error() string {
+func (oog GasOverflowError) Error() string {
 	return "gas overflow in location: " + oog.Descriptor
 }