Merge branch 'master' into hariom/gno-test-patterns

.github/.fossa.yml

@@ -0,0 +1,15 @@
+version: 3
+
+# https://github.com/fossas/fossa-cli/blob/master/docs/references/files/fossa-yml.md
+
+project:
+  id: github.com/gnolang/gno
+  name: gno
+
+targets:
+  only:
+    - type: gomod
+
+paths:
+  exclude:
+    - ./misc/

.github/workflows/fossa.yml

@@ -0,0 +1,50 @@
+name: Dependency License Scanning
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - ".github/.fossa.yml"
+      - ".github/workflows/fossa.yml"
+  schedule:
+    - cron: '0 0 * * 6' # At 00:00 on saturdays
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    name: Fossa
+    runs-on: ubuntu-latest
+    if: github.repository == 'gnolang/gno'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
+          fetch-depth: 0
+
+      - name: Move .fossa.yml to root dir
+        run: mv .github/.fossa.yml .
+
+      - name: Cache Coursier cache
+        uses: coursier/cache-action@v6.4.0
+
+      - name: Set up JDK 17
+        uses: coursier/setup-action@v1.3.0
+        with:
+          jvm: temurin:1.17
+
+      - name: Set up fossa CLI
+        run: "curl -H 'Cache-Control: no-cache' https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash"
+
+      - name: FOSSA analyze
+        run: fossa analyze
+        env:
+          FOSSA_API_KEY: "${{secrets.FOSSA_API_KEY}}"
+
+      - name: FOSSA test
+        run: fossa test
+        env:
+          FOSSA_API_KEY: "${{secrets.FOSSA_API_KEY}}"
+

.github/workflows/gnoland.yml

@@ -60,7 +60,9 @@ jobs:
           - _test.gnoland
           - _test.gnokey
           - _test.pkgs
-          #- _test.gnoweb # this test should be rewritten to run an inmemory localnode
+          # XXX: test broken, should be rewritten to run an inmemory localnode
+          # Re-add to makefile when fixed. Tracked here: https://github.com/gnolang/gno/issues/1222
+          #- _test.gnoweb
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -73,14 +75,33 @@ jobs:
         run: |
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
+          export LOG_DIR="${{ runner.temp }}/logs/test-${{ matrix.goversion }}-gnoland"
           make ${{ matrix.args }}
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+      - name: Upload Test Log
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: logs-test-gnoland-go${{ matrix.goversion }}
+          path: ${{ runner.temp }}/logs/**/*.log
+      - uses: actions/upload-artifact@v3
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        with:
+          name: ${{runner.os}}-coverage-gnoland-${{ matrix.args}}-${{matrix.goversion}}
+          path: ./gno.land/coverage.out
+
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
+          directory: ${{ runner.temp }}/coverage
           token: ${{ secrets.CODECOV_TOKEN }}
-          name: gno.land
-          flags: gno.land-${{matrix.args}}
-          files: ./gno.land/coverage.out
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
 
   docker-integration:

.github/workflows/gnovm.yml

@@ -78,12 +78,24 @@ jobs:
           export GOPATH=$HOME/go
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        with:
+          name: ${{runner.os}}-coverage-gnovm-${{ matrix.args}}-${{matrix.goversion}}
+          path: ./gnovm/coverage.out
+
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          name: gnovm
-          verbose: true
-          flags: gnovm-${{matrix.args}}
-          files: ./gnovm/coverage.out
+          directory: ${{ runner.temp }}/coverage
+          token: ${{ secrets.CODECOV_TOKEN }} 
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
+

.github/workflows/tm2.yml

@@ -68,12 +68,24 @@ jobs:
           export GOTEST_FLAGS="-v -p 1 -timeout=30m -coverprofile=coverage.out -covermode=atomic"
           make ${{ matrix.args }}
           touch coverage.out
-      - if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+      - uses: actions/upload-artifact@v3
+        if: ${{ runner.os == 'Linux' && matrix.goversion == '1.21.x' }}
+        with:
+          name: ${{runner.os}}-coverage-tm2-${{ matrix.args}}-${{matrix.goversion}}
+          path: ./tm2/coverage.out
+
+  upload-coverage:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all previous coverage artifacts
+        uses: actions/download-artifact@v3
+        with:
+          path: ${{ runner.temp }}/coverage
+      - name: Upload combined coverage to Codecov
         uses: codecov/codecov-action@v3
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          name: tm2
-          verbose: true
-          flags: tm2-${{matrix.args}}
-          files: ./tm2/coverage.out
+          directory: ${{ runner.temp }}/coverage
+          token: ${{ secrets.CODECOV_TOKEN }} 
           fail_ci_if_error: ${{ github.repository == 'gnolang/gno' }}
+

Dockerfile

@@ -17,7 +17,8 @@ RUN         rm -rf /opt/gno/src/.git
 
 # runtime-base + runtime-tls
 FROM        debian:stable-slim AS runtime-base
-ENV         PATH="${PATH}:/opt/gno/bin"
+ENV         PATH="${PATH}:/opt/gno/bin" \
+            GNOROOT="/opt/gno/src"
 WORKDIR     /opt/gno/src
 FROM        runtime-base AS runtime-tls
 RUN         apt-get update && apt-get install -y expect ca-certificates && update-ca-certificates

docs/testing_guide.md

@@ -0,0 +1,86 @@
+# Gnoland Testing Guide
+
+This guide provides an overview of our testing practices and conventions. While most of our testing aligns with typical Go practices, there are exceptions and specifics you should be aware of.
+
+## Standard Package Testing
+
+For most packages, tests are written and executed in the standard Go manner:
+
+- Tests are located alongside the code they test.
+- The `go test` command can be used to execute tests.
+
+However, as mentioned earlier, there are some exceptions. In the following sections, we will explore our specialized tests and how to work with them.
+
+## Gno Filetests
+
+**Location:** `gnovm/test/files`
+
+These are our custom file-based tests tailored specifically for this project.
+
+**Execution:** 
+
+From the gnovm directory, There are two main commands to run Gno filetests:
+
+1. To test native files, use:
+```
+make _test.gnolang.native
+```
+
+2. To test standard libraries, use:
+```
+make _test.gnolang.stdlibs
+```
+
+**Golden Files Update:** 
+
+Golden files are references for expected outputs. Sometimes, after certain updates, these need to be synchronized. To do so:
+
+1. For native tests:
+```
+make _test.gnolang.native.sync
+```
+
+2. For standard library tests:
+```
+make _test.gnolang.stdlibs.sync
+```
+
+## Integration Tests
+
+**Location:** `gno.land/**/testdata`
+
+From the gno.land directory, Integration tests are designed to ensure different parts of the project work cohesively. Specifically:
+
+1. **InMemory Node Integration Testing:**  
+   Found in `gno.land/cmd/gnoland/testdata`, these are dedicated to running integration tests against a genuine `gnoland` node.
+
+2. **Integration Features Testing:**  
+   Located in `gno.land/pkg/integration/testdata`, these tests target integrations specific commands.
+
+These integration tests utilize the `testscript` package and follow the `txtar` file specifications. 
+
+**Documentation:**
+
+- For general `testscript` package documentation, refer to: [testscript documentation](https://github.com/rogpeppe/go-internal/blob/v1.11.0/testscript/doc.go)
+
+- For more specific details about our integration tests, consult our extended documentation: [gnoland integration documentation](https://github.com/gnolang/gno/blob/master/gno.land/pkg/integration/doc.go)
+
+**Execution:** 
+
+To run the integration tests (alongside other packages):
+
+```
+make _test.pkgs
+```
+
+**Golden Files Update within txtar:** 
+
+For tests utilizing the `cmp` command inside `txtar` files, golden files can be synchronized using:
+
+```
+make _test.pkgs.sync
+```
+
+---
+
+As the project evolves, this guide might be updated. 

gno.land/Makefile

@@ -43,11 +43,16 @@ fmt:
 ########################################
 # Test suite
 .PHONY: test
-test: _test.gnoland _test.gnoweb _test.gnokey _test.pkgs
+test: _test.gnoland _test.gnokey _test.pkgs
+# XXX: _test.gnoweb is currently disabled. If fixed, re-enable here and in CI.
+# https://github.com/gnolang/gno/issues/1222
 
 GOTEST_FLAGS ?= -v -p 1 -timeout=30m
 
-_test.gnoland:; go test $(GOTEST_FLAGS) ./cmd/gnoland
-_test.gnoweb:;  go test $(GOTEST_FLAGS) ./cmd/gnoweb
-_test.gnokey:;  go test $(GOTEST_FLAGS) ./cmd/gnokey
-_test.pkgs:;    go test $(GOTEST_FLAGS) ./pkg/...
+_test.gnoland:;      go test $(GOTEST_FLAGS) ./cmd/gnoland
+_test.gnoweb:;       go test $(GOTEST_FLAGS) ./cmd/gnoweb
+_test.gnokey:;       go test $(GOTEST_FLAGS) ./cmd/gnokey
+_test.pkgs:;         go test $(GOTEST_FLAGS) ./pkg/...
+_test.pkgs.sync:;    UPDATE_SCRIPTS=true go test $(GOTEST_FLAGS) ./pkg/...
+
+

gno.land/cmd/gnokey/main.go

@@ -5,11 +5,12 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 )
 
 func main() {
-	cmd := client.NewRootCmd()
+	cmd := client.NewRootCmd(commands.NewDefaultIO())
 
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)

gno.land/cmd/gnoland/integration_test.go

@@ -0,0 +1,12 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/gnolang/gno/gno.land/pkg/integration"
+	"github.com/rogpeppe/go-internal/testscript"
+)
+
+func TestTestdata(t *testing.T) {
+	testscript.Run(t, integration.SetupGnolandTestScript(t, "testdata"))
+}

gno.land/cmd/gnoland/testdata/addpkg.txtar

@@ -0,0 +1,26 @@
+# test for add package
+
+## start a new node
+gnoland start
+
+## add bar.gno package located in $WORK directory as gno.land/r/foobar/bar
+gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/foobar/bar -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
+
+## execute Render
+gnokey maketx call -pkgpath gno.land/r/foobar/bar -func Render -gas-fee 1000000ugnot -gas-wanted 2000000 -args '' -broadcast -chainid=tendermint_test test1
+
+## compare render
+cmp stdout stdout.golden
+
+-- bar.gno --
+package bar
+
+func Render(path string) string {
+ 	return "hello from foo"
+}
+
+-- stdout.golden --
+("hello from foo" string)
+OK!
+GAS WANTED: 2000000
+GAS USED:   69163