chore: rename RealmUnhandledPanicException type to `UnhandledPanicE…

…rror` and change its `String()` method to `Error()`
gnolang · Aug 1, 2024 · 778965e · 778965e
1 parent d3f6b4a
commit 778965e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/gno.land/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go
@@ -540,9 +540,9 @@ func (vm *VMKeeper) Call(ctx sdk.Context, msg MsgCall) (res string, err error) {
 			switch r := r.(type) {
 			case store.OutOfGasException: // panic in consumeGas()
 				panic(r)
-			case gno.RealmUnhandledPanicException:
-				err = errors.Wrap(fmt.Errorf("%v", r), "VM call panic: %s\nStacktrace: %s\n",
-					r.Descriptor, m.ExceptionsStacktrace())
+			case gno.UnhandledPanicError:
+				err = errors.Wrap(fmt.Errorf("%v", r.Error()), "VM call panic: %s\nStacktrace: %s\n",
+					r.Error(), m.ExceptionsStacktrace())
 			default:
 				err = errors.Wrap(fmt.Errorf("%v", r), "VM call panic: %v\nMachine State:%s\nStacktrace: %s\n",
 					r, m.String(), m.Stacktrace().String())

diff --git a/gnovm/cmd/gno/run.go b/gnovm/cmd/gno/run.go
@@ -189,9 +189,9 @@ func runExpr(m *gno.Machine, expr string) {
 	defer func() {
 		if r := recover(); r != nil {
 			switch r := r.(type) {
-			case gno.RealmUnhandledPanicException:
+			case gno.UnhandledPanicError:
 				fmt.Printf("panic running expression %s: %v\nStacktrace: %s\n",
-					expr, r, m.ExceptionsStacktrace())
+					expr, r.Error(), m.ExceptionsStacktrace())
 			default:
 				fmt.Printf("panic running expression %s: %v\nMachine State:%s\nStacktrace: %s\n",
 					expr, r, m.String(), m.Stacktrace().String())

diff --git a/gnovm/pkg/gnolang/debugger_test.go b/gnovm/pkg/gnolang/debugger_test.go
@@ -61,7 +61,7 @@ func evalTest(debugAddr, in, file string) (out, err, stacktrace string) {
 	defer func() {
 		if r := recover(); r != nil {
 			switch r.(type) {
-			case gnolang.RealmUnhandledPanicException:
+			case gnolang.UnhandledPanicError:
 				stacktrace = m.ExceptionsStacktrace()
 			default:
 				stacktrace = m.Stacktrace().String()

diff --git a/gnovm/pkg/gnolang/machine.go b/gnovm/pkg/gnolang/machine.go
@@ -33,12 +33,12 @@ func (e Exception) Sprint(m *Machine) string {
 	return e.Value.Sprint(m)
 }
 
-// RealmUnhandledPanicException represents an error thrown when a panic is not handled in the realm.
-type RealmUnhandledPanicException struct {
+// UnhandledPanicError represents an error thrown when a panic is not handled in the realm.
+type UnhandledPanicError struct {
 	Descriptor string // Description of the unhandled panic.
 }
 
-func (e RealmUnhandledPanicException) String() string {
+func (e UnhandledPanicError) Error() string {
 	return e.Descriptor
 }
 
@@ -785,9 +785,9 @@ func (m *Machine) RunFunc(fn Name) {
 	defer func() {
 		if r := recover(); r != nil {
 			switch r := r.(type) {
-			case RealmUnhandledPanicException:
-				fmt.Printf("Machine.RunFunc(%q) panic: %v\nStacktrace: %s\n",
-					fn, r.Descriptor, m.ExceptionsStacktrace())
+			case UnhandledPanicError:
+				fmt.Printf("Machine.RunFunc(%q) panic: %s\nStacktrace: %s\n",
+					fn, r.Error(), m.ExceptionsStacktrace())
 			default:
 				fmt.Printf("Machine.RunFunc(%q) panic: %v\nMachine State:%s\nStacktrace: %s\n",
 					fn, r, m.String(), m.Stacktrace().String())
@@ -802,9 +802,9 @@ func (m *Machine) RunMain() {
 	defer func() {
 		if r := recover(); r != nil {
 			switch r := r.(type) {
-			case RealmUnhandledPanicException:
-				fmt.Printf("Machine.RunMain() panic: %v\nStacktrace: %s\n",
-					r.Descriptor, m.ExceptionsStacktrace())
+			case UnhandledPanicError:
+				fmt.Printf("Machine.RunMain() panic: %s\nStacktrace: %s\n",
+					r.Error(), m.ExceptionsStacktrace())
 			default:
 				fmt.Printf("Machine.RunMain() panic: %v\nMachine State:%s\nStacktrace: %s\n",
 					r, m.String(), m.Stacktrace())

diff --git a/gnovm/pkg/gnolang/op_call.go b/gnovm/pkg/gnolang/op_call.go
@@ -427,7 +427,7 @@ func (m *Machine) doOpPanic2() {
 			for i, ex := range m.Exceptions {
 				exs[i] = ex.Sprint(m)
 			}
-			panic(RealmUnhandledPanicException{
+			panic(UnhandledPanicError{
 				Descriptor: strings.Join(exs, "\n\t"),
 			})
 		}

diff --git a/gnovm/tests/file.go b/gnovm/tests/file.go
@@ -260,8 +260,8 @@ func RunFileTest(rootDir string, path string, opts ...RunFileTestOption) error {
 						errstr = v.Sprint(m)
 					case *gno.PreprocessError:
 						errstr = v.Unwrap().Error()
-					case gno.RealmUnhandledPanicException:
-						errstr = v.Descriptor
+					case gno.UnhandledPanicError:
+						errstr = v.Error()
 					default:
 						errstr = strings.TrimSpace(fmt.Sprintf("%v", pnc))
 					}
@@ -381,7 +381,7 @@ func RunFileTest(rootDir string, path string, opts ...RunFileTestOption) error {
 					var stacktrace string
 
 					switch pnc.(type) {
-					case gno.RealmUnhandledPanicException:
+					case gno.UnhandledPanicError:
 						stacktrace = m.ExceptionsStacktrace()
 					default:
 						stacktrace = m.Stacktrace().String()