chore: relocate tm2/std.MemFile in gnovm/std

gno.land/pkg/gnoclient/client_test.go

@@ -8,6 +8,7 @@ import (
 
  "github.com/gnolang/gno/gno.land/pkg/gnoland/ugnot"
  "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
+ gnostd "github.com/gnolang/gno/gnovm/pkg/std"
  abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
  ctypes "github.com/gnolang/gno/tm2/pkg/bft/rpc/core/types"
  "github.com/gnolang/gno/tm2/pkg/bft/types"
@@ -17,7 +18,7 @@ import (
  "github.com/gnolang/gno/tm2/pkg/std"
 )
 
-var testGasFee = ugnot.ValueString(10000)
+var testGasFee = ugnot.ValueString(10_000)
 
 func TestRender(t *testing.T) {
  t.Parallel()
@@ -652,8 +653,8 @@ func main() {
 
  msg := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
- Files: []*std.MemFile{
+ Package: &gnostd.MemPackage{
+ Files: []*gnostd.MemFile{
  {
  Name: "main.gno",
  Body: fileBody,
@@ -729,8 +730,8 @@ func main() {
 
  msg1 := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
- Files: []*std.MemFile{
+ Package: &gnostd.MemPackage{
+ Files: []*gnostd.MemFile{
  {
  Name: "main1.gno",
  Body: fileBody,
@@ -742,8 +743,8 @@ func main() {
 
  msg2 := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
- Files: []*std.MemFile{
+ Package: &gnostd.MemPackage{
+ Files: []*gnostd.MemFile{
  {
  Name: "main2.gno",
  Body: fileBody,
@@ -794,10 +795,10 @@ func TestRunErrors(t *testing.T) {
  msgs: []vm.MsgRun{
  {
  Caller: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -841,10 +842,10 @@ func TestRunErrors(t *testing.T) {
  msgs: []vm.MsgRun{
  {
  Caller: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -872,10 +873,10 @@ func TestRunErrors(t *testing.T) {
  msgs: []vm.MsgRun{
  {
  Caller: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -903,10 +904,10 @@ func TestRunErrors(t *testing.T) {
  msgs: []vm.MsgRun{
  {
  Caller: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -943,7 +944,7 @@ func TestRunErrors(t *testing.T) {
  msgs: []vm.MsgRun{
  {
  Caller: mockAddress,
- Package: &std.MemPackage{Name: "", Path: " "},
+ Package: &gnostd.MemPackage{Name: "", Path: " "},
  Send: nil,
  },
  },
@@ -993,10 +994,10 @@ func TestAddPackageErrors(t *testing.T) {
  msgs: []vm.MsgAddPackage{
  {
  Creator: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -1040,10 +1041,10 @@ func TestAddPackageErrors(t *testing.T) {
  msgs: []vm.MsgAddPackage{
  {
  Creator: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -1071,10 +1072,10 @@ func TestAddPackageErrors(t *testing.T) {
  msgs: []vm.MsgAddPackage{
  {
  Creator: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -1102,10 +1103,10 @@ func TestAddPackageErrors(t *testing.T) {
  msgs: []vm.MsgAddPackage{
  {
  Creator: mockAddress,
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "",
  Path: "",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "file1.gno",
  Body: "",
@@ -1142,7 +1143,7 @@ func TestAddPackageErrors(t *testing.T) {
  msgs: []vm.MsgAddPackage{
  {
  Creator: mockAddress,
- Package: &std.MemPackage{Name: "", Path: ""},
+ Package: &gnostd.MemPackage{Name: "", Path: ""},
  Deposit: nil,
  },
  },

gno.land/pkg/gnoclient/integration_test.go

@@ -5,17 +5,17 @@ import (
 
  "github.com/gnolang/gno/gnovm/pkg/gnolang"
 
- "github.com/gnolang/gno/tm2/pkg/sdk/bank"
- "github.com/gnolang/gno/tm2/pkg/std"
-
  "github.com/gnolang/gno/gno.land/pkg/gnoland/ugnot"
  "github.com/gnolang/gno/gno.land/pkg/integration"
  "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
  "github.com/gnolang/gno/gnovm/pkg/gnoenv"
+ gnostd "github.com/gnolang/gno/gnovm/pkg/std"
  rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
  "github.com/gnolang/gno/tm2/pkg/crypto"
  "github.com/gnolang/gno/tm2/pkg/crypto/keys"
  "github.com/gnolang/gno/tm2/pkg/log"
+ "github.com/gnolang/gno/tm2/pkg/sdk/bank"
+ "github.com/gnolang/gno/tm2/pkg/std"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
 )
@@ -316,9 +316,9 @@ func main() {
  // Make Msg configs
  msg := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "main",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "main.gno",
  Body: fileBody,
@@ -393,9 +393,9 @@ func main() {
  // Make Msg configs
  msg1 := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "main",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "main.gno",
  Body: fileBody1,
@@ -406,9 +406,9 @@ func main() {
  }
  msg2 := vm.MsgRun{
  Caller: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "main",
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "main.gno",
  Body: fileBody2,
@@ -474,10 +474,10 @@ func Echo(str string) string {
  // Make Msg config
  msg := vm.MsgAddPackage{
  Creator: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "echo",
  Path: deploymentPath,
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: fileName,
  Body: body,
@@ -564,10 +564,10 @@ func Hello(str string) string {
 
  msg1 := vm.MsgAddPackage{
  Creator: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "echo",
  Path: deploymentPath1,
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "echo.gno",
  Body: body1,
@@ -579,10 +579,10 @@ func Hello(str string) string {
 
  msg2 := vm.MsgAddPackage{
  Creator: caller.GetAddress(),
- Package: &std.MemPackage{
+ Package: &gnostd.MemPackage{
  Name: "hello",
  Path: deploymentPath2,
- Files: []*std.MemFile{
+ Files: []*gnostd.MemFile{
  {
  Name: "gno.mod",
  Body: "module gno.land/p/demo/integration/test/hello",

gno.land/pkg/gnoland/app_test.go

@@ -9,7 +9,8 @@ import (
  "time"
 
  "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
- gnostd "github.com/gnolang/gno/gnovm/stdlibs/std"
+ gnostd "github.com/gnolang/gno/gnovm/pkg/std"
+ gnostdlibs "github.com/gnolang/gno/gnovm/stdlibs/std"
  "github.com/gnolang/gno/tm2/pkg/amino"
  abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
  bft "github.com/gnolang/gno/tm2/pkg/bft/types"
@@ -53,7 +54,7 @@ func TestNewAppWithOptions(t *testing.T) {
  },
  Txs: []std.Tx{
  {
- Msgs: []std.Msg{vm.NewMsgAddPackage(addr, "gno.land/r/demo", []*std.MemFile{
+ Msgs: []std.Msg{vm.NewMsgAddPackage(addr, "gno.land/r/demo", []*gnostd.MemFile{
  {
  Name: "demo.gno",
  Body: "package demo; func Hello() string { return `hello`; }",
@@ -308,7 +309,7 @@ func TestEndBlocker(t *testing.T) {
  c := newCollector[validatorUpdate](mockEventSwitch, noFilter)
 
  // Fire a GnoVM event
- mockEventSwitch.FireEvent(gnostd.GnoEvent{})
+ mockEventSwitch.FireEvent(gnostdlibs.GnoEvent{})
 
  // Create the EndBlocker
  eb := EndBlocker(c, mockVMKeeper, &mockEndBlockerApp{})
@@ -351,7 +352,7 @@ func TestEndBlocker(t *testing.T) {
  c := newCollector[validatorUpdate](mockEventSwitch, noFilter)
 
  // Fire a GnoVM event
- mockEventSwitch.FireEvent(gnostd.GnoEvent{})
+ mockEventSwitch.FireEvent(gnostdlibs.GnoEvent{})
 
  // Create the EndBlocker
  eb := EndBlocker(c, mockVMKeeper, &mockEndBlockerApp{})
@@ -390,7 +391,7 @@ func TestEndBlocker(t *testing.T) {
  // Construct the GnoVM events
  vmEvents := make([]abci.Event, 0, len(changes))
  for index := range changes {
- event := gnostd.GnoEvent{
+ event := gnostdlibs.GnoEvent{
  Type: validatorAddedEvent,
  PkgPath: valRealm,
  }
@@ -399,7 +400,7 @@ func TestEndBlocker(t *testing.T) {
  if index%2 == 0 {
  changes[index].Power = 0
 
- event = gnostd.GnoEvent{
+ event = gnostdlibs.GnoEvent{
  Type: validatorRemovedEvent,
  PkgPath: valRealm,
  }

gno.land/pkg/gnoweb/gnoweb.go

@@ -17,10 +17,10 @@ import (
  "strings"
  "time"
 
+ gnostd "github.com/gnolang/gno/gnovm/pkg/std"
  "github.com/gnolang/gno/tm2/pkg/amino"
  abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
  "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
- "github.com/gnolang/gno/tm2/pkg/std"
  "github.com/gorilla/mux"
  "github.com/gotuna/gotuna"
 
@@ -358,7 +358,7 @@ func handlerPackageFile(logger *slog.Logger, app gotuna.App, cfg *Config) http.H
  return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
  vars := mux.Vars(r)
  pkgpath := "gno.land/p/" + vars["filepath"]
- diruri, filename := std.SplitFilepath(pkgpath)
+ diruri, filename := gnostd.SplitFilepath(pkgpath)
  if filename == "" && diruri == pkgpath {
  // redirect to diruri + "/"
  http.Redirect(w, r, "/p/"+vars["filepath"]+"/", http.StatusFound)

gno.land/pkg/keyscli/run.go

@@ -9,6 +9,7 @@
 
  "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
  gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
+ gnostd "github.com/gnolang/gno/gnovm/pkg/std"
  "github.com/gnolang/gno/tm2/pkg/amino"
  "github.com/gnolang/gno/tm2/pkg/commands"
  "github.com/gnolang/gno/tm2/pkg/crypto/keys"
@@ -73,13 +74,13 @@
  return errors.Wrap(err, "parsing gas fee coin")
  }
 
- memPkg := &std.MemPackage{}
+ memPkg := &gnostd.MemPackage{}
  if sourcePath == "-" { // stdin
  data, err := io.ReadAll(cmdio.In())
  if err != nil {
  return fmt.Errorf("could not read stdin: %w", err)
  }
- memPkg.Files = []*std.MemFile{
+ memPkg.Files = []*gnostd.MemFile{
  {
  Name: "stdin.gno",
  Body: string(data),
@@ -97,7 +98,7 @@
  if err != nil {
  return fmt.Errorf("could not read %q: %w", sourcePath, err)
  }
- memPkg.Files = []*std.MemFile{
+ memPkg.Files = []*gnostd.MemFile{
  {
  Name: info.Name(),
  Body: string(b),