chore: attempt to improve OriginCall funcs

cmd/gnodev/test_test.go

@@ -97,6 +97,9 @@ func TestTest(t *testing.T) {
 			args:                []string{"test", "--verbose", "--run", ".*/hi", "../../examples/gno.land/p/demo/ufmt"},
 			stdoutShouldContain: "RUN   TestSprintf",
 			stderrShouldContain: "ok      ./../../examples/gno.land/p/demo/ufmt",
+		}, {
+			args:                []string{"test", "../../tests/integ/origin-call"},
+			stderrShouldContain: "ok      ./../../tests/integ/origin-call",
 		}, {
 			args:                []string{"test", "--verbose", "--run", ".*/NoExists", "../../examples/gno.land/p/demo/ufmt"},
 			stderrShouldContain: "ok      ./../../examples/gno.land/p/demo/ufmt",

stdlibs/stdlibs.go

@@ -142,17 +142,18 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) {
 		pn.DefineGoNativeValue("IntSize", strconv.IntSize)
 		pn.DefineGoNativeValue("AppendUint", strconv.AppendUint)
 	case "std":
-		// NOTE: some of these are overridden in tests/imports_test.go
+		// NOTE: some of these are overridden in tests/imports.go
 		// Also see stdlibs/InjectPackage.
 		pn.DefineNative("AssertOriginCall",
 			gno.Flds( // params
 			),
 			gno.Flds( // results
 			),
 			func(m *gno.Machine) {
-				isOrigin := len(m.Frames) == 2
+				ctx := m.Context.(ExecContext)
+				isOrigin := ctx.Msg != nil && len(ctx.Msg.GetSigners()) > 0
 				if !isOrigin {
-					panic("invalid non-origin call")
+					m.Panic(typedString("invalid non-origin call"))
 				}
 			},
 		)
@@ -163,7 +164,8 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) {
 				"isOrigin", "bool",
 			),
 			func(m *gno.Machine) {
-				isOrigin := len(m.Frames) == 2
+				ctx := m.Context.(ExecContext)
+				isOrigin := ctx.Msg != nil && len(ctx.Msg.GetSigners()) > 0
 				res0 := gno.TypedValue{T: gno.BoolType}
 				res0.SetBool(isOrigin)
 				m.PushValue(res0)

tests/file.go

@@ -15,6 +15,7 @@ import (
 	"github.com/gnolang/gno/pkgs/crypto"
 	gno "github.com/gnolang/gno/pkgs/gnolang"
 	osm "github.com/gnolang/gno/pkgs/os"
+	"github.com/gnolang/gno/pkgs/sdk/testutils"
 	"github.com/gnolang/gno/pkgs/std"
 	"github.com/gnolang/gno/stdlibs"
 )
@@ -41,7 +42,7 @@ func testMachineCustom(store gno.Store, pkgPath string, stdout io.Writer, maxAll
 		ChainID:       "dev",
 		Height:        123,
 		Timestamp:     1234567890,
-		Msg:           nil,
+		Msg:           testutils.NewTestMsg(caller),
 		OrigCaller:    caller.Bech32(),
 		OrigPkgAddr:   pkgAddr.Bech32(),
 		OrigSend:      send,

tests/imports.go

@@ -465,36 +465,6 @@ func testPackageInjector(store gno.Store, pn *gno.PackageNode) {
 		pn.DefineGoNativeValue("ParseInt", strconv.ParseInt)
 	case "std":
 		// NOTE: some of these are overrides.
-		// Also see stdlibs/InjectPackage.
-		pn.DefineNativeOverride("AssertOriginCall",
-			/*
-				gno.Flds( // params
-				),
-				gno.Flds( // results
-				),
-			*/
-			func(m *gno.Machine) {
-				isOrigin := len(m.Frames) == 3
-				if !isOrigin {
-					panic("invalid non-origin call")
-				}
-			},
-		)
-		pn.DefineNativeOverride("IsOriginCall",
-			/*
-				gno.Flds( // params
-				),
-				gno.Flds( // results
-					"isOrigin", "bool",
-				),
-			*/
-			func(m *gno.Machine) {
-				isOrigin := len(m.Frames) == 3
-				res0 := gno.TypedValue{T: gno.BoolType}
-				res0.SetBool(isOrigin)
-				m.PushValue(res0)
-			},
-		)
 		pn.DefineNativeOverride("GetCallerAt",
 			/*
 				gno.Flds( // params
@@ -534,6 +504,20 @@ func testPackageInjector(store gno.Store, pn *gno.PackageNode) {
 				m.PushValue(res0)
 			},
 		)
+		// TestClearOriginCall sets ctx.Msg=nil (it's non-nil by default in test
+		// setup).
+		// This ensures that AssertOriginCall panics and IsOriginCall returns false.
+		pn.DefineNative("TestClearOriginCall",
+			gno.Flds( // params
+			),
+			gno.Flds( // results
+			),
+			func(m *gno.Machine) {
+				ctx := m.Context.(stdlibs.ExecContext)
+				ctx.Msg = nil
+				m.Context = ctx
+			},
+		)
 		pn.DefineNative("TestSetOrigCaller",
 			gno.Flds( // params
 				"", "Address",

tests/integ/origin-call/origincall.gno

@@ -0,0 +1 @@
+package origincall

tests/integ/origin-call/origincall_filetest.gno

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"std"
+	"testing"
+
+	"gno.land/p/demo/testutils"
+)
+
+func main() {
+	test()
+	std.TestClearOriginCall()
+	test()
+}
+
+func test() {
+	if std.IsOriginCall() {
+		println("IsOriginCall: true")
+	} else {
+		println("IsOriginCall: false")
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			println("AssertOriginCall: panic:", r.(string))
+		}
+	}()
+	std.AssertOriginCall()
+	println("AssertOriginCall: no panic")
+}
+
+// Output:
+// IsOriginCall: true
+// AssertOriginCall: no panic
+// IsOriginCall: false
+// AssertOriginCall: panic: invalid non-origin call

tests/integ/origin-call/origincall_test.gno

@@ -0,0 +1,37 @@
+package origincall
+
+import (
+	"std"
+	"testing"
+
+	"gno.land/p/demo/testutils"
+)
+
+func TestOriginCall(t *testing.T) {
+	std.AssertOriginCall()
+	if b := std.IsOriginCall(); !b {
+		t.Errorf("expect isOriginCall true, got false")
+	}
+
+	std.TestClearOriginCall()
+	requirePanic(t, func() {
+		std.AssertOriginCall()
+	}, "invalid non-origin call")
+	// NOTE(tb): it's deceptively not possible to have a test for AssertOriginCall
+	// and an other test for IsOriginCall because the context is shared between
+	// tests (e.g. if std.TestSetOrigCaller is called in a test, this affects also
+	// the following test).
+	if b := std.IsOriginCall(); b {
+		t.Errorf("expect isOriginCall false, got true")
+	}
+}
+
+func requirePanic(t *testing.T, f func(), expRecover string) {
+	defer func() {
+		r := recover()
+		if r == nil || r.(string) != expRecover {
+			t.Fatalf("expected panic with '%v', got '%v'", expRecover, r)
+		}
+	}()
+	f()
+}