lint: fix workflows and sim_test

sge-network · Oct 20, 2023 · 88b1cff · 88b1cff
1 parent 0710ba0
commit 88b1cff
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 55 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - uses: technote-space/get-diff-action@v6.0.1
         with:
           PATTERNS: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - name: Display go version
         run: go version
       - name: install tparse
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - uses: technote-space/get-diff-action@v4
         id: git_diff
         with:
@@ -51,7 +51,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - uses: actions/checkout@v2
       - name: Create a file with all the pkgs
         run: go list ./... > pkgs.txt
@@ -86,7 +86,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - uses: technote-space/get-diff-action@v4
         with:
           PATTERNS: |
@@ -164,7 +164,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.20
       - uses: technote-space/get-diff-action@v4
         with:
           PATTERNS: |

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -6,7 +6,6 @@ import (
 	"os"
 	"testing"
 
-	sdksimapp "cosmossdk.io/simapp"
 	dbm "github.com/cometbft/cometbft-db"
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cometbft/cometbft/libs/rand"
@@ -32,7 +31,14 @@ func init() {
 // Profile with:
 // /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/SgeApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out
 func BenchmarkFullAppSimulation(b *testing.B) {
-	config, db, dir, logger, _, err := simtestutil.SetupSimulation("goleveldb-app-sim", "Simulation")
+	config := simcli.NewConfigFromFlags()
+	db, dir, logger, _, err := simtestutil.SetupSimulation(
+		config,
+		"goleveldb-app-sim",
+		"Simulation",
+		simcli.FlagVerboseValue,
+		simcli.FlagEnabledValue,
+	)
 	if err != nil {
 		b.Fatalf("simulation setup failed: %s", err.Error())
 	}
@@ -45,7 +51,7 @@ func BenchmarkFullAppSimulation(b *testing.B) {
 		}
 	}()
 
-	app := app.NewSgeApp(
+	sApp := app.NewSgeApp(
 		logger,
 		db,
 		nil,
@@ -62,17 +68,21 @@ func BenchmarkFullAppSimulation(b *testing.B) {
 	_, simParams, simErr := simulation.SimulateFromSeed(
 		b,
 		os.Stdout,
-		app.BaseApp,
-		simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()),
+		sApp.BaseApp,
+		simtestutil.AppStateFn(
+			sApp.AppCodec(),
+			sApp.SimulationManager(),
+			app.NewDefaultGenesisState(),
+		),
 		simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1
-		simtestutil.SimulationOperations(app, app.AppCodec(), config),
-		app.ModuleAccountAddrs(),
+		simtestutil.SimulationOperations(sApp, sApp.AppCodec(), config),
+		sApp.ModuleAccountAddrs(),
 		config,
-		app.AppCodec(),
+		sApp.AppCodec(),
 	)
 
 	// export state and simParams before the simulation error is checked
-	if err = simtestutil.CheckExportSimulation(app, config, simParams); err != nil {
+	if err = simtestutil.CheckExportSimulation(sApp, config, simParams); err != nil {
 		b.Fatal(err)
 	}
 
@@ -96,12 +106,12 @@ func TestAppStateDeterminism(t *testing.T) {
 		t.Skip("skipping application simulation")
 	}
 
-	config := sdksimapp.NewConfigFromFlags()
+	config := simcli.NewConfigFromFlags()
 	config.InitialBlockHeight = 1
 	config.ExportParamsPath = ""
 	config.OnOperation = false
 	config.AllInvariants = false
-	config.ChainID = sdksimapp.SimAppChainID
+	config.ChainID = SimAppChainID
 
 	numSeeds := 3
 	numTimesToRunPerSeed := 5
@@ -119,7 +129,7 @@ func TestAppStateDeterminism(t *testing.T) {
 			}
 
 			db := dbm.NewMemDB()
-			app := app.NewSgeApp(
+			sApp := app.NewSgeApp(
 				logger,
 				db,
 				nil,
@@ -140,21 +150,25 @@ func TestAppStateDeterminism(t *testing.T) {
 			_, _, err := simulation.SimulateFromSeed(
 				t,
 				os.Stdout,
-				app.BaseApp,
-				simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()),
+				sApp.BaseApp,
+				simtestutil.AppStateFn(
+					sApp.AppCodec(),
+					sApp.SimulationManager(),
+					app.NewDefaultGenesisState(),
+				),
 				simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1
-				simtestutil.SimulationOperations(app, app.AppCodec(), config),
-				app.ModuleAccountAddrs(),
+				simtestutil.SimulationOperations(sApp, sApp.AppCodec(), config),
+				sApp.ModuleAccountAddrs(),
 				config,
-				app.AppCodec(),
+				sApp.AppCodec(),
 			)
 			require.NoError(t, err)
 
 			if config.Commit {
 				simtestutil.PrintStats(db)
 			}
 
-			appHash := app.LastCommitID().Hash
+			appHash := sApp.LastCommitID().Hash
 			appHashList[j] = appHash
 
 			if j != 0 {

diff --git a/proto/Dockerfile b/proto/Dockerfile
@@ -3,7 +3,7 @@
 
 FROM bufbuild/buf:1.7.0 as BUILDER
 
-FROM golang:1.19-alpine
+FROM golang:1.20-alpine
 
 
 RUN apk add --no-cache \

diff --git a/proto/sgenetwork/sge/mint/tx.proto b/proto/sgenetwork/sge/mint/tx.proto
@@ -7,7 +7,6 @@ import "cosmos/msg/v1/msg.proto";
 import "amino/amino.proto";
 import "gogoproto/gogo.proto";
 import "cosmos_proto/cosmos.proto";
-import "sgenetwork/sge/mint/minter.proto";
 import "sgenetwork/sge/mint/params.proto";
 
 // Msg defines the x/mint Msg service.
@@ -26,15 +25,17 @@ service Msg {
 // Since: cosmos-sdk 0.47
 message MsgUpdateParams {
   option (cosmos.msg.v1.signer) = "authority";
-  option (amino.name)           = "sge/x/mint/MsgUpdateParams";
+  option (amino.name) = "sge/x/mint/MsgUpdateParams";
 
-  // authority is the address that controls the module (defaults to x/gov unless overwritten).
-  string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"];
+  // authority is the address that controls the module (defaults to x/gov unless
+  // overwritten).
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
 
   // params defines the x/mint parameters to update.
   //
   // NOTE: All parameters must be supplied.
-  Params params = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true];
+  Params params = 2
+      [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }
 
 // MsgUpdateParamsResponse defines the response structure for executing a

diff --git a/x/bet/module_simulation.go b/x/bet/module_simulation.go
@@ -37,7 +37,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 

diff --git a/x/house/module_simulation.go b/x/house/module_simulation.go
@@ -30,7 +30,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 

diff --git a/x/market/module_simulation.go b/x/market/module_simulation.go
@@ -44,7 +44,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 

diff --git a/x/mint/module_simulation.go b/x/mint/module_simulation.go
@@ -30,7 +30,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 

diff --git a/x/mint/types/tx.pb.go b/x/mint/types/tx.pb.go
diff --git a/x/orderbook/module_simulation.go b/x/orderbook/module_simulation.go
@@ -36,7 +36,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }
 

diff --git a/x/ovm/module_simulation.go b/x/ovm/module_simulation.go
@@ -37,7 +37,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 }
 
 // ProposalContents doesn't return any content functions for governance proposals
-func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalContent {
+func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedProposalMsg {
 	return nil
 }