chore: gofumpt (#183)

* fumpt without bak
* chore: cleanup

Signed-off-by: Jacob Gadikian <[email protected]>
Co-authored-by: Manfred Touron <[email protected]>

alloc.go

@@ -35,6 +35,7 @@ const (
 	_allocType             = 200 // XXX
 	_allocAny              = 200 // XXX
 )
+
 const (
 	allocString      = _allocBase
 	allocStringByte  = 1

cmd/genproto/genproto.go

@@ -20,7 +20,7 @@ func main() {
 		multisig.Package,
 		merkle.Package,
 		abci.Package,
-		//types.Package,
+		// types.Package,
 	}
 	for _, pkg := range pkgs {
 		genproto.WriteProto3Schema(pkg)

cmd/gnodev/main.go

@@ -19,8 +19,10 @@ func main() {
 	}
 }
 
-type AppItem = command.AppItem
-type AppList = command.AppList
+type (
+	AppItem = command.AppItem
+	AppList = command.AppList
+)
 
 var mainApps AppList = []AppItem{
 	{precompileApp, "precompile", "precompile .gno to .go", DefaultPrecompileOptions},
@@ -52,5 +54,4 @@ func runMain(cmd *command.Command, exec string, args []string) error {
 
 	// unknown app command!
 	return errors.New("unknown command " + args[0])
-
 }

cmd/gnodev/precompile.go

@@ -102,7 +102,7 @@ func precompileFile(srcPath string, opts precompileOptions) error {
 
 	// write .go file.
 	targetPath := strings.TrimSuffix(srcPath, ".gno") + ".gno.gen.go"
-	err = ioutil.WriteFile(targetPath, []byte(transformed), 0644)
+	err = ioutil.WriteFile(targetPath, []byte(transformed), 0o644)
 	if err != nil {
 		return fmt.Errorf("write .go file: %w", err)
 	}

cmd/gnofaucet/gnofaucet.go

@@ -18,15 +18,16 @@ import (
 	"github.com/gnolang/gno/pkgs/std"
 )
 
-type AppItem = command.AppItem
-type AppList = command.AppList
+type (
+	AppItem = command.AppItem
+	AppList = command.AppList
+)
 
 var mainApps AppList = []AppItem{
 	{serveApp, "serve", "serve faucet", DefaultServeOptions},
 }
 
 func runMain(cmd *command.Command, exec string, args []string) error {
-
 	// show help message.
 	if len(args) == 0 || args[0] == "help" || args[0] == "--help" {
 		cmd.Println("available subcommands:")
@@ -46,7 +47,6 @@ func runMain(cmd *command.Command, exec string, args []string) error {
 
 	// unknown app command!
 	return errors.New("unknown command " + args[0])
-
 }
 
 func main() {
@@ -138,8 +138,8 @@ func serveApp(cmd *command.Command, args []string, iopts interface{}) error {
 	resdata := qres.Response.Data
 	var acc gnoland.GnoAccount
 	amino.MustUnmarshalJSON(resdata, &acc)
-	var accountNumber = acc.BaseAccount.AccountNumber
-	var sequence = acc.BaseAccount.Sequence
+	accountNumber := acc.BaseAccount.AccountNumber
+	sequence := acc.BaseAccount.Sequence
 
 	// Get password for supply account.
 	// Test by signing a dummy message;
@@ -224,7 +224,6 @@ func serveApp(cmd *command.Command, args []string, iopts interface{}) error {
 }
 
 func sendAmountTo(cmd *command.Command, cli rpcclient.Client, name, pass string, toAddr crypto.Address, accountNumber, sequence uint64, send std.Coins, opts serveOptions) error {
-
 	// Read supply account pubkey.
 	kb, err := keys.NewKeyBaseFromDir(opts.Home)
 	if err != nil {
@@ -259,7 +258,7 @@ func sendAmountTo(cmd *command.Command, cli rpcclient.Client, name, pass string,
 	// fill tx signatures.
 	signers := tx.GetSigners()
 	if tx.Signatures == nil {
-		for _, _ = range signers {
+		for range signers {
 			tx.Signatures = append(tx.Signatures, std.Signature{
 				PubKey:    nil, // zero signature
 				Signature: nil, // zero signature
@@ -281,7 +280,7 @@ func sendAmountTo(cmd *command.Command, cli rpcclient.Client, name, pass string,
 	}
 
 	found := false
-	for i, _ := range tx.Signatures {
+	for i := range tx.Signatures {
 		// override signature for matching slot.
 		if signers[i] == fromAddr {
 			found = true

cmd/gnofaucet/throttle.go

@@ -12,8 +12,8 @@ type SubnetThrottler struct {
 	service.BaseService
 	ticker   *time.Ticker
 	subnets3 [2 << (8 * 3)]uint8
-	//subnets2 [2 << (8 * 2)]uint8
-	//subnets1 [2 << (8 * 1)]uint8
+	// subnets2 [2 << (8 * 2)]uint8
+	// subnets1 [2 << (8 * 1)]uint8
 }
 
 func NewSubnetThrottler() *SubnetThrottler {
@@ -61,5 +61,4 @@ func (st *SubnetThrottler) Request(ip net.IP) bool {
 		st.subnets3[bucket3] += 1
 	}
 	return true
-
 }

cmd/gnokey/gnokeys.go

@@ -32,15 +32,21 @@ func main() {
 }
 
 var makeTxApps client.AppList = []client.AppItem{
-	{makeAddPackageTxApp,
+	{
+		makeAddPackageTxApp,
 		"addpkg", "upload new package",
-		defaultMakeAddPackageTxOptions},
-	{makeCallTxApp,
+		defaultMakeAddPackageTxOptions,
+	},
+	{
+		makeCallTxApp,
 		"call", "call public function",
-		defaultMakeCallTxOptions},
-	{makeSendTxApp,
+		defaultMakeCallTxOptions,
+	},
+	{
+		makeSendTxApp,
 		"send", "send coins",
-		defaultMakeSendTxOptions},
+		defaultMakeSendTxOptions,
+	},
 }
 
 func makeTxApp(cmd *command.Command, args []string, iopts interface{}) error {

cmd/gnoland/main.go

@@ -81,7 +81,7 @@ func makeGenesisDoc(pvPub crypto.PubKey) *bft.GenesisDoc {
 		},
 	}
 	gen.Validators = []bft.GenesisValidator{
-		bft.GenesisValidator{
+		{
 			Address: pvPub.Address(),
 			PubKey:  pvPub,
 			Power:   10,
@@ -165,7 +165,8 @@ func makeGenesisDoc(pvPub crypto.PubKey) *bft.GenesisDoc {
 		"r/foo20",
 		"r/users",
 		"r/boards",
-		"r/banktest"} {
+		"r/banktest",
+	} {
 		// open files in directory as MemPackage.
 		memPkg := gno.ReadMemPackage("./examples/gno.land/"+path, "gno.land/"+path)
 		var tx std.Tx

cmd/gnotxport/export.go

@@ -42,7 +42,7 @@ func txExportApp(cmd *command.Command, args []string, iopts interface{}) error {
 	} else {
 		last = opts.EndHeight
 	}
-	out, err := os.OpenFile(opts.OutFile, os.O_RDWR|os.O_CREATE, 0755)
+	out, err := os.OpenFile(opts.OutFile, os.O_RDWR|os.O_CREATE, 0o755)
 	if err != nil {
 		return err
 	}

cmd/gnotxport/import.go

@@ -38,7 +38,7 @@ func txImportApp(cmd *command.Command, args []string, iopts interface{}) error {
 	lines := strings.Split(strings.TrimSpace(string(filebz)), "\n")
 	for i, line := range lines {
 		print(".")
-		//time.Sleep(10 * time.Second)
+		// time.Sleep(10 * time.Second)
 		if len(line) == 0 {
 			panic(i)
 		}

cmd/gnotxport/main.go

@@ -7,8 +7,10 @@ import (
 	"github.com/gnolang/gno/pkgs/errors"
 )
 
-type AppItem = command.AppItem
-type AppList = command.AppList
+type (
+	AppItem = command.AppItem
+	AppList = command.AppList
+)
 
 var mainApps AppList = []AppItem{
 	{txExportApp, "export", "export txs from node", defaultTxExportOptions},
@@ -41,5 +43,4 @@ func main() {
 
 	// unknown app command!
 	panic(errors.New("unknown command " + args[0]))
-
 }

cmd/gnoview/main.go

@@ -16,11 +16,12 @@ import (
 	"github.com/gnolang/gno/logos"
 )
 
-var row = 0
-var tc_style = tcell.StyleDefault
+var (
+	row      = 0
+	tc_style = tcell.StyleDefault
+)
 
 func bootGnoland() (*gno.PackageValue, *bytes.Buffer) {
-
 	// Create a new machine.
 	rr := makeRealmer()
 	pn := gno.NewPackageNode("main", "gno.land/r/main", &gno.FileSet{})
@@ -60,7 +61,6 @@ func bootGnoland() (*gno.PackageValue, *bytes.Buffer) {
 }
 
 func main() {
-
 	// bootGnoland
 	pv, out := bootGnoland()
 

cmd/gnoview/value_elem.go

@@ -9,14 +9,14 @@ import (
 )
 
 var tstyle = &logos.Style{ // text
-	//Background: tcell.ColorWhite,
+	// Background: tcell.ColorWhite,
 	CursorStyle: &logos.Style{
 		Background: tcell.ColorYellow,
 	},
 }
 
 var istyle = &logos.Style{ // elem in list
-	//Background: tcell.ColorWhite,
+	// Background: tcell.ColorWhite,
 	Padding: logos.Padding{2, 0, 0, 0},
 	Border:  logos.LeftBorder(),
 	CursorStyle: &logos.Style{
@@ -27,7 +27,7 @@ var istyle = &logos.Style{ // elem in list
 }
 
 var bstyle = &logos.Style{ // box style
-	//Background: tcell.ColorWhite,
+	// Background: tcell.ColorWhite,
 	Padding: logos.Padding{2, 0, 2, 1},
 	Border:  logos.DefaultBorder(),
 	CursorStyle: &logos.Style{

cmd/goscan/goscan.go

@@ -28,5 +28,4 @@ func main() {
 
 	// Print the imports from the file's AST.
 	spew.Dump(f)
-
 }

data/gnoland/main.go

@@ -2,9 +2,11 @@ package main
 
 var root Node
 
-type Node interface{}
-type Key interface{}
-type Value interface{}
+type (
+	Node  interface{}
+	Key   interface{}
+	Value interface{}
+)
 
 type InnerNode struct {
 	Key   Key

frame.go

@@ -6,7 +6,6 @@ import "fmt"
 // (runtime) Frame
 
 type Frame struct {
-
 	// general
 	Label     Name // for break/continue
 	Source    Node // source of frame

gno_test.go

@@ -188,7 +188,6 @@ func TestTypeConversion(t *testing.T) {
 		z := v.(Interface1)
 		fmt.Println(z)
 	})
-
 }
 
 func TestSomething(t *testing.T) {
@@ -205,7 +204,6 @@ func TestSomething(t *testing.T) {
 	fmt.Println(unsafe.Sizeof(Foo{X: reflect.ValueOf(0)}.X)) // still 16? weird.
 	fmt.Println(unsafe.Sizeof(reflect.ValueOf(0)))           // 24
 	fmt.Println(unsafe.Sizeof(Bar{}))
-
 }
 
 // XXX is there a way to test in Go as well as Gno?
@@ -277,7 +275,6 @@ func TestBinaryShortCircuit(t *testing.T) {
 	} else {
 		fmt.Println("done")
 	}
-
 }
 
 // XXX is there a way to test in Go as well as Gno?
@@ -327,8 +324,7 @@ func TestMultiAssignment(t *testing.T) {
 		return i
 	}
 
-	*ref(0), *ref(1), *ref(2), *ref(3) =
-		val(11), val(22), val(33), val(44)
+	*ref(0), *ref(1), *ref(2), *ref(3) = val(11), val(22), val(33), val(44)
 
 	/*
 		ref(0) called

gnoland/app.go

@@ -55,14 +55,14 @@ func NewApp(rootDir string, logger log.Logger) (abci.Application, error) {
 	baseApp.SetAnteHandler(
 		// Override default AnteHandler with custom logic.
 		func(ctx sdk.Context, tx std.Tx, simulate bool) (
-			newCtx sdk.Context, res sdk.Result, abort bool) {
+			newCtx sdk.Context, res sdk.Result, abort bool,
+		) {
 			// Override auth params.
 			ctx = ctx.WithValue(
 				auth.AuthParamsContextKey{}, auth.DefaultParams())
 			// Continue on with default auth ante handler.
 			newCtx, res, abort = authAnteHandler(ctx, tx, simulate)
 			return
-
 		},
 	)
 

gnoland/website/main.go

@@ -341,8 +341,8 @@ func handlerStaticFile(app gotuna.App) http.Handler {
 		}
 
 		// TODO: ModTime doesn't work for embed?
-		//w.Header().Set("ETag", fmt.Sprintf("%x", stat.ModTime().UnixNano()))
-		//w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s", "31536000"))
+		// w.Header().Set("ETag", fmt.Sprintf("%x", stat.ModTime().UnixNano()))
+		// w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s", "31536000"))
 		fileapp.ServeHTTP(w, r)
 	})
 }

go2gno.go

@@ -98,7 +98,6 @@ func MustParseExpr(expr string) Expr {
 
 // filename must not include the path.
 func ParseFile(filename string, body string) (fn *FileNode, err error) {
-
 	// Parse src but stop after processing the imports.
 	fs := token.NewFileSet()
 	f, err := parser.ParseFile(fs, filename, body, parser.ParseComments|parser.DeclarationErrors)
@@ -621,7 +620,6 @@ func toDecls(fs *token.FileSet, gd *ast.GenDecl) (ds Decls) {
 	var lastValues Exprs // (see Go iota spec above)
 	var lastType Expr    // (see Go iota spec above)
 	for si, s := range gd.Specs {
-
 		switch s := s.(type) {
 		case *ast.TypeSpec:
 			name := toName(s.Name)