feat(gnovm): add gno fmt command (gnolang#2156)

Co-authored-by: Manfred Touron <94029+moul@users.noreply.github.com>
gfanton · Jul 23, 2024 · 5278b88 · 5278b88
1 parent 2e6f18a
commit 5278b88
Show file tree

Hide file tree

Showing 94 changed files with 1,659 additions and 188 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -71,6 +71,22 @@ jobs:
  - run: make lint -C ./examples
  # TODO: consider running lint on every other directories, maybe in "warning" mode?
  # TODO: track coverage
+ fmt:
+ strategy:
+ fail-fast: false
+ matrix:
+ goversion: [ "1.22.x" ]
+ runs-on: ubuntu-latest
+ timeout-minutes: 10
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-go@v5
+ with:
+ go-version: ${{ matrix.goversion }}
+ - run: |
+ make fmt -C ./examples
+ # Check if there are changes after running make fmt
+ git diff --exit-code || (echo "Some gno files are not formatted, please run 'make fmt'." && exit 1)
  mod-tidy:
  strategy:
  fail-fast: false

diff --git a/.github/workflows/gnofmt_template.yml b/.github/workflows/gnofmt_template.yml
@@ -0,0 +1,24 @@
+on:
+ workflow_call:
+ inputs:
+ path:
+ required: true
+ type: string
+ go-version:
+ required: true
+ type: string
+
+jobs:
+ fmt:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Install Go
+ uses: actions/setup-go@v5
+ with:
+ go-version: ${{ inputs.go-version }}
+ - name: Checkout code
+ uses: actions/checkout@v4
+ - name: Fmt
+ env:
+ GNOFMT_PATH: ${{ inputs.path }}
+ run: go run ./gnovm/cmd/gno fmt -v -diff $GNOFMT_PATH
diff --git a/.github/workflows/gnovm.yml b/.github/workflows/gnovm.yml
@@ -19,3 +19,9 @@ jobs:
  modulepath: "gnovm"
  secrets:
  codecov-token: ${{ secrets.CODECOV_TOKEN }}
+ fmt:
+ name: Run Gno Fmt
+ uses: ./.github/workflows/gnofmt_template.yml
+ with:
+ path: "gnovm/stdlibs/..."
+ go-version: "1.22.x"
diff --git a/examples/Makefile b/examples/Makefile
@@ -56,14 +56,9 @@ clean:
  find . \( -name "*.gno.gen.go" -or -name ".*.gno.gen_test.go" \) -delete
 
 .PHONY: fmt
-GOFMT_FLAGS ?= -w
+GNOFMT_FLAGS ?= -w
 fmt:
- go run -modfile ../misc/devdeps/go.mod mvdan.cc/gofumpt $(GOFMT_FLAGS) `find . -name "*.gno"`
-
-.PHONY: imports
-GOIMPORTS_FLAGS ?= -w
-imports:
- $(rundep) golang.org/x/tools/cmd/goimports $(GOIMPORTS_FLAGS) .
+ go run ../gnovm/cmd/gno fmt $(GNOFMT_FLAGS) ./...
 
 .PHONY: tidy
 tidy:

diff --git a/examples/gno.land/p/demo/avl/tree_test.gno b/examples/gno.land/p/demo/avl/tree_test.gno
@@ -1,8 +1,6 @@
 package avl
 
-import (
- "testing"
-)
+import "testing"
 
 func TestNewTree(t *testing.T) {
  tree := NewTree()

diff --git a/examples/gno.land/p/demo/bf/bf_test.gno b/examples/gno.land/p/demo/bf/bf_test.gno
@@ -1,9 +1,6 @@
 package bf
 
-import (
- "bytes"
- "testing"
-)
+import "testing"
 
 func TestExecuteBrainfuck(t *testing.T) {
  testCases := []struct {

diff --git a/examples/gno.land/p/demo/cford32/cford32_test.gno b/examples/gno.land/p/demo/cford32/cford32_test.gno
@@ -6,7 +6,6 @@ import (
  "fmt"
  "io"
  "math"
- "strconv"
  "strings"
  "testing"
 )

diff --git a/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno b/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno
@@ -2,7 +2,6 @@ package main
 
 import (
  "std"
- "time"
 
  "gno.land/p/demo/grc/exts/vault"
  "gno.land/p/demo/grc/grc20"

diff --git a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno
@@ -1,11 +1,8 @@
 package grc1155
 
 import (
- "fmt"
  "std"
  "testing"
-
- "gno.land/p/demo/users"
 )
 
 const dummyURI = "ipfs://xyz"

diff --git a/examples/gno.land/p/demo/grc/grc1155/gno.mod b/examples/gno.land/p/demo/grc/grc1155/gno.mod
@@ -3,5 +3,4 @@ module gno.land/p/demo/grc/grc1155
 require (
  gno.land/p/demo/avl v0.0.0-latest
  gno.land/p/demo/ufmt v0.0.0-latest
- gno.land/p/demo/users v0.0.0-latest
 )
diff --git a/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno b/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno
@@ -3,9 +3,6 @@ package grc721
 import (
  "std"
  "testing"
-
- "gno.land/p/demo/testutils"
- "gno.land/p/demo/users"
 )
 
 var (

diff --git a/examples/gno.land/p/demo/grc/grc721/gno.mod b/examples/gno.land/p/demo/grc/grc721/gno.mod
@@ -4,5 +4,4 @@ require (
  gno.land/p/demo/avl v0.0.0-latest
  gno.land/p/demo/testutils v0.0.0-latest
  gno.land/p/demo/ufmt v0.0.0-latest
- gno.land/p/demo/users v0.0.0-latest
 )
diff --git a/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno b/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno
@@ -5,7 +5,6 @@ import (
  "testing"
 
  "gno.land/p/demo/testutils"
- "gno.land/p/demo/users"
 )
 
 func TestSetMetadata(t *testing.T) {

diff --git a/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno b/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno
@@ -5,8 +5,6 @@ import (
  "testing"
 
  "gno.land/p/demo/testutils"
- "gno.land/p/demo/ufmt"
- "gno.land/p/demo/users"
 )
 
 func TestSetTokenRoyalty(t *testing.T) {

diff --git a/examples/gno.land/p/demo/grc/grc721/igrc721_royalty.gno b/examples/gno.land/p/demo/grc/grc721/igrc721_royalty.gno
@@ -1,8 +1,6 @@
 package grc721
 
-import (
- "std"
-)
+import "std"
 
 // IGRC2981 follows the Ethereum standard
 type IGRC2981 interface {

diff --git a/examples/gno.land/p/demo/groups/groups.gno b/examples/gno.land/p/demo/groups/groups.gno
@@ -1,8 +1,6 @@
 package groups
 
-import (
- "gno.land/r/demo/boards"
-)
+import "gno.land/r/demo/boards"
 
 // TODO implement something and test.
 type Group struct {

diff --git a/examples/gno.land/p/demo/int256/absolute.gno b/examples/gno.land/p/demo/int256/absolute.gno
@@ -1,8 +1,6 @@
 package int256
 
-import (
- "gno.land/p/demo/uint256"
-)
+import "gno.land/p/demo/uint256"
 
 // Abs returns |z|
 func (z *Int) Abs() *uint256.Uint {

diff --git a/examples/gno.land/p/demo/int256/arithmetic.gno b/examples/gno.land/p/demo/int256/arithmetic.gno
@@ -1,8 +1,6 @@
 package int256
 
-import (
- "gno.land/p/demo/uint256"
-)
+import "gno.land/p/demo/uint256"
 
 func (z *Int) Add(x, y *Int) *Int {
  z.initiateAbs()

diff --git a/examples/gno.land/p/demo/int256/bitwise_test.gno b/examples/gno.land/p/demo/int256/bitwise_test.gno
@@ -1,11 +1,9 @@
 package int256
 
-import (
- "gno.land/p/demo/uint256"
-)
-
 import (
  "testing"
+
+ "gno.land/p/demo/uint256"
 )
 
 func TestOr(t *testing.T) {

diff --git a/examples/gno.land/p/demo/int256/cmp_test.gno b/examples/gno.land/p/demo/int256/cmp_test.gno
@@ -1,8 +1,6 @@
 package int256
 
-import (
- "testing"
-)
+import "testing"
 
 func TestEq(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/int256/conversion.gno b/examples/gno.land/p/demo/int256/conversion.gno
@@ -1,8 +1,6 @@
 package int256
 
-import (
- "gno.land/p/demo/uint256"
-)
+import "gno.land/p/demo/uint256"
 
 // SetInt64 sets z to x and returns z.
 func (z *Int) SetInt64(x int64) *Int {

diff --git a/examples/gno.land/p/demo/int256/int256_test.gno b/examples/gno.land/p/demo/int256/int256_test.gno
@@ -1,9 +1,7 @@
 // ported from github.com/mempooler/int256
 package int256
 
-import (
- "testing"
-)
+import "testing"
 
 func TestSign(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/json/buffer_test.gno b/examples/gno.land/p/demo/json/buffer_test.gno
@@ -1,8 +1,6 @@
 package json
 
-import (
- "testing"
-)
+import "testing"
 
 func TestBufferCurrent(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/json/decode_test.gno b/examples/gno.land/p/demo/json/decode_test.gno
@@ -2,7 +2,6 @@ package json
 
 import (
  "bytes"
- "encoding/json"
  "testing"
 )
 

diff --git a/examples/gno.land/p/demo/json/encode_test.gno b/examples/gno.land/p/demo/json/encode_test.gno
@@ -1,8 +1,6 @@
 package json
 
-import (
- "testing"
-)
+import "testing"
 
 func TestMarshal_Primitive(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/json/parser_test.gno b/examples/gno.land/p/demo/json/parser_test.gno
@@ -1,9 +1,6 @@
 package json
 
-import (
- "strconv"
- "testing"
-)
+import "testing"
 
 func TestParseStringLiteral(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/json/path_test.gno b/examples/gno.land/p/demo/json/path_test.gno
@@ -1,8 +1,6 @@
 package json
 
-import (
- "testing"
-)
+import "testing"
 
 func TestParseJSONPath(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/p/demo/math_eval/int32/int32_test.gno b/examples/gno.land/p/demo/math_eval/int32/int32_test.gno
@@ -1,11 +1,6 @@
 package int32
 
-import (
- "std"
- "testing"
-
- "gno.land/p/demo/ufmt"
-)
+import "testing"
 
 func TestOne(t *testing.T) {
  ttt := []struct {

diff --git a/examples/gno.land/p/demo/merkle/merkle_test.gno b/examples/gno.land/p/demo/merkle/merkle_test.gno
@@ -3,7 +3,6 @@ package merkle
 import (
  "fmt"
  "testing"
- "time"
 )
 
 type testData struct {

diff --git a/examples/gno.land/p/demo/mux/response.gno b/examples/gno.land/p/demo/mux/response.gno
@@ -1,8 +1,6 @@
 package mux
 
-import (
- "strings"
-)
+import "strings"
 
 // ResponseWriter represents the response writer.
 type ResponseWriter struct {

diff --git a/examples/gno.land/p/demo/mux/router_test.gno b/examples/gno.land/p/demo/mux/router_test.gno
@@ -1,9 +1,6 @@
 package mux
 
-import (
- "strings"
- "testing"
-)
+import "testing"
 
 func TestRouter_Render(t *testing.T) {
  // Define handlers and route configuration

diff --git a/examples/gno.land/p/demo/stack/stack_test.gno b/examples/gno.land/p/demo/stack/stack_test.gno
@@ -1,8 +1,6 @@
 package stack
 
-import (
- "testing"
-)
+import "testing"
 
 func TestStack(t *testing.T) {
  s := New() // Empty stack

diff --git a/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno b/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno
@@ -1,7 +1,6 @@
 package main
 
 import (
- "std"
  "time"
 
  "internal/os_test"

diff --git a/examples/gno.land/p/demo/uint256/bitwise_test.gno b/examples/gno.land/p/demo/uint256/bitwise_test.gno
@@ -1,8 +1,6 @@
 package uint256
 
-import (
- "testing"
-)
+import "testing"
 
 type logicOpTest struct {
  name string

diff --git a/examples/gno.land/p/demo/uint256/conversion_test.gno b/examples/gno.land/p/demo/uint256/conversion_test.gno
@@ -1,8 +1,6 @@
 package uint256
 
-import (
- "testing"
-)
+import "testing"
 
 func TestIsUint64(t *testing.T) {
  tests := []struct {

diff --git a/examples/gno.land/r/demo/art/millipede/millipede_test.gno b/examples/gno.land/r/demo/art/millipede/millipede_test.gno
@@ -1,8 +1,6 @@
 package millipede
 
-import (
- "testing"
-)
+import "testing"
 
 func TestRender(t *testing.T) {
  cases := []struct {

diff --git a/examples/gno.land/r/demo/echo/echo_test.gno b/examples/gno.land/r/demo/echo/echo_test.gno
@@ -1,8 +1,6 @@
 package echo
 
-import (
- "testing"
-)
+import "testing"
 
 func Test(t *testing.T) {
  if Render("aa") != "aa" {