From 1dd11a100fbaa0d6e02e39d33ade306f686424e6 Mon Sep 17 00:00:00 2001 From: Pantani Date: Wed, 11 Oct 2023 13:36:53 +0200 Subject: [PATCH 01/10] update lint and add some lint fixes --- .github/workflows/test-lint.yml | 6 +++- ignite/cmd/plugin_test.go | 6 ++-- ignite/internal/tools/gen-cli-docs/main.go | 2 +- ignite/pkg/cliui/clispinner/clispinner.go | 4 +-- ignite/pkg/cliui/view/errorview/error.go | 4 +-- ignite/pkg/cmdrunner/cmdrunner.go | 4 +-- .../pkg/cosmosanalysis/cosmosanalysis_test.go | 4 ++- ignite/pkg/cosmosfaucet/http_faucet.go | 15 ++++++-- ignite/pkg/cosmosfaucet/http_openapi.go | 2 +- .../adapter/postgres/postgres.go | 2 +- .../adapter/postgres/postgres_test.go | 3 +- ignite/pkg/debugger/server.go | 2 +- ignite/pkg/jsonfile/jsonfile_test.go | 3 +- ignite/pkg/looseerrgroup/looseerrgroup.go | 2 +- ignite/pkg/openapiconsole/console.go | 2 +- .../truncatedbuffer/truncatedbuffer_test.go | 9 +++-- ignite/pkg/xgenny/xgenny.go | 9 +++-- ignite/pkg/xhttp/response.go | 2 +- ignite/pkg/xhttp/server.go | 2 +- ignite/services/chain/runtime.go | 12 +++++-- ignite/services/doctor/doctor.go | 6 ++-- ignite/services/plugin/interface.go | 35 +++++++++++++++---- ignite/services/plugin/plugin.go | 2 +- ignite/services/plugin/plugin_test.go | 3 +- integration/network/network_test.go | 1 + integration/node/cmd_query_bank_test.go | 2 +- 26 files changed, 101 insertions(+), 43 deletions(-) diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml index 34ec364ef9..81de57e565 100644 --- a/.github/workflows/test-lint.yml +++ b/.github/workflows/test-lint.yml @@ -6,6 +6,7 @@ on: - '**.md' branches: - main + - release/* concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -27,6 +28,9 @@ jobs: - uses: golangci/golangci-lint-action@v3 if: env.GIT_DIFF with: - version: v1.52.1 + version: v1.54.2 + skip-cache: true + disable: + - depguard args: --timeout 10m github-token: ${{ secrets.github_token }} diff --git a/ignite/cmd/plugin_test.go b/ignite/cmd/plugin_test.go index baded90f0a..abb51f5a18 100644 --- a/ignite/cmd/plugin_test.go +++ b/ignite/cmd/plugin_test.go @@ -332,7 +332,8 @@ ignite rootCmd := buildRootCmd() tt.setup(t, pi) - linkPlugins(rootCmd, []*plugin.Plugin{p}) + err := linkPlugins(rootCmd, []*plugin.Plugin{p}) + require.NoError(err) if tt.expectedError != "" { require.Error(p.Error) @@ -540,7 +541,8 @@ func TestLinkPluginHooks(t *testing.T) { rootCmd := buildRootCmd() tt.setup(t, pi) - linkPlugins(rootCmd, []*plugin.Plugin{p}) + err := linkPlugins(rootCmd, []*plugin.Plugin{p}) + require.NoError(err) if tt.expectedError != "" { require.EqualError(p.Error, tt.expectedError) diff --git a/ignite/internal/tools/gen-cli-docs/main.go b/ignite/internal/tools/gen-cli-docs/main.go index b07cfd4502..275fb31666 100644 --- a/ignite/internal/tools/gen-cli-docs/main.go +++ b/ignite/internal/tools/gen-cli-docs/main.go @@ -123,7 +123,7 @@ func generateCmd(cmd *cobra.Command, w io.Writer) error { continue } - io.WriteString(w, "\n") + _, _ = io.WriteString(w, "\n") if err := generateCmd(cmd, w); err != nil { return err diff --git a/ignite/pkg/cliui/clispinner/clispinner.go b/ignite/pkg/cliui/clispinner/clispinner.go index 1a5c628a41..5bc6c5b48b 100644 --- a/ignite/pkg/cliui/clispinner/clispinner.go +++ b/ignite/pkg/cliui/clispinner/clispinner.go @@ -93,7 +93,7 @@ func (s *Spinner) SetCharset(charset []string) *Spinner { // SetColor sets the prefix for spinner. func (s *Spinner) SetColor(color string) *Spinner { - s.sp.Color(color) + _ = s.sp.Color(color) return s } @@ -107,7 +107,7 @@ func (s *Spinner) Start() *Spinner { func (s *Spinner) Stop() *Spinner { s.sp.Stop() s.sp.Prefix = "" - s.sp.Color(spinnerColor) + _ = s.sp.Color(spinnerColor) s.sp.UpdateCharSet(charset) s.sp.Stop() return s diff --git a/ignite/pkg/cliui/view/errorview/error.go b/ignite/pkg/cliui/view/errorview/error.go index 2eca7ef1cc..e0b4c47ef4 100644 --- a/ignite/pkg/cliui/view/errorview/error.go +++ b/ignite/pkg/cliui/view/errorview/error.go @@ -21,8 +21,8 @@ func (e Error) String() string { w := wordwrap.NewWriter(80) w.Breakpoints = []rune{' '} - w.Write([]byte(s)) - w.Close() + _, _ = w.Write([]byte(s)) + _ = w.Close() return colors.Error(w.String()) } diff --git a/ignite/pkg/cmdrunner/cmdrunner.go b/ignite/pkg/cmdrunner/cmdrunner.go index ad31599c62..7f33b56d83 100644 --- a/ignite/pkg/cmdrunner/cmdrunner.go +++ b/ignite/pkg/cmdrunner/cmdrunner.go @@ -189,7 +189,7 @@ type cmdSignal struct { *exec.Cmd } -func (e *cmdSignal) Signal(s os.Signal) { e.Cmd.Process.Signal(s) } +func (e *cmdSignal) Signal(s os.Signal) { _ = e.Cmd.Process.Signal(s) } func (e *cmdSignal) Write([]byte) (n int, err error) { return 0, nil } @@ -199,7 +199,7 @@ type cmdSignalWithWriter struct { w io.WriteCloser } -func (e *cmdSignalWithWriter) Signal(s os.Signal) { e.Cmd.Process.Signal(s) } +func (e *cmdSignalWithWriter) Signal(s os.Signal) { _ = e.Cmd.Process.Signal(s) } func (e *cmdSignalWithWriter) Write(data []byte) (n int, err error) { defer e.w.Close() diff --git a/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go b/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go index b1c8236267..c3c7149d40 100644 --- a/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go +++ b/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go @@ -156,10 +156,12 @@ func TestFindImplementationNotFound(t *testing.T) { // No implementation found, err := cosmosanalysis.FindImplementation(tmpDir1, expectedInterface) + require.NoError(t, err) require.Len(t, found, 0) // Partial implementation found, err = cosmosanalysis.FindImplementation(tmpDir2, expectedInterface) + require.NoError(t, err) require.Len(t, found, 0) } @@ -189,7 +191,7 @@ func TestFindAppFilePath(t *testing.T) { appTestFilePath := filepath.Join(secondaryAppFolder, "my_own_app_test.go") err = os.WriteFile(appTestFilePath, appTestFile, 0o644) require.NoError(t, err) - pathFound, err = cosmosanalysis.FindAppFilePath(tmpDir) + _, err = cosmosanalysis.FindAppFilePath(tmpDir) //nolint:ineffassign require.Error(t, err) require.Contains(t, err.Error(), "cannot locate your app.go") diff --git a/ignite/pkg/cosmosfaucet/http_faucet.go b/ignite/pkg/cosmosfaucet/http_faucet.go index 66b15d2ea1..1a1d3b0039 100644 --- a/ignite/pkg/cosmosfaucet/http_faucet.go +++ b/ignite/pkg/cosmosfaucet/http_faucet.go @@ -69,10 +69,13 @@ type FaucetInfoResponse struct { } func (f Faucet) faucetInfoHandler(w http.ResponseWriter, _ *http.Request) { - xhttp.ResponseJSON(w, http.StatusOK, FaucetInfoResponse{ + err := xhttp.ResponseJSON(w, http.StatusOK, FaucetInfoResponse{ IsAFaucet: true, ChainID: f.chainID, }) + if err != nil { + panic(err) + } } // coinsFromRequest determines tokens to transfer from transfer request. @@ -94,11 +97,17 @@ func (f Faucet) coinsFromRequest(req TransferRequest) (sdk.Coins, error) { } func responseSuccess(w http.ResponseWriter) { - xhttp.ResponseJSON(w, http.StatusOK, TransferResponse{}) + err := xhttp.ResponseJSON(w, http.StatusOK, TransferResponse{}) + if err != nil { + panic(err) + } } func responseError(w http.ResponseWriter, code int, err error) { - xhttp.ResponseJSON(w, code, TransferResponse{ + errResp := xhttp.ResponseJSON(w, code, TransferResponse{ Error: err.Error(), }) + if errResp != nil { + panic(errResp) + } } diff --git a/ignite/pkg/cosmosfaucet/http_openapi.go b/ignite/pkg/cosmosfaucet/http_openapi.go index 05457fcb1a..a5533ec79d 100644 --- a/ignite/pkg/cosmosfaucet/http_openapi.go +++ b/ignite/pkg/cosmosfaucet/http_openapi.go @@ -21,5 +21,5 @@ type openAPIData struct { } func (f Faucet) openAPISpecHandler(w http.ResponseWriter, _ *http.Request) { - tmplOpenAPISpec.Execute(w, f.openAPIData) + _ = tmplOpenAPISpec.Execute(w, f.openAPIData) } diff --git a/ignite/pkg/cosmostxcollector/adapter/postgres/postgres.go b/ignite/pkg/cosmostxcollector/adapter/postgres/postgres.go index c88b7acd9c..9a008ac871 100644 --- a/ignite/pkg/cosmostxcollector/adapter/postgres/postgres.go +++ b/ignite/pkg/cosmostxcollector/adapter/postgres/postgres.go @@ -176,7 +176,7 @@ func (a Adapter) Save(ctx context.Context, txs []cosmosclient.TX) error { } // Rollback won't have any effect if the transaction is committed before - defer sqlTx.Rollback() + defer sqlTx.Rollback() //nolint:errcheck // Prepare insert statements to speed up "bulk" saving times txStmt, err := sqlTx.PrepareContext(ctx, sqlInsertTX) diff --git a/ignite/pkg/cosmostxcollector/adapter/postgres/postgres_test.go b/ignite/pkg/cosmostxcollector/adapter/postgres/postgres_test.go index 7cce2c6f57..05b4d1c61c 100644 --- a/ignite/pkg/cosmostxcollector/adapter/postgres/postgres_test.go +++ b/ignite/pkg/cosmostxcollector/adapter/postgres/postgres_test.go @@ -231,7 +231,8 @@ func TestQuery(t *testing.T) { // Act cr, err := adapter.Query(ctx, qry) if cr.Next() { - cr.Scan(&rowValue) + err = cr.Scan(&rowValue) + require.NoError(t, err) } // Assert diff --git a/ignite/pkg/debugger/server.go b/ignite/pkg/debugger/server.go index a83c3b6026..9e6e14d431 100644 --- a/ignite/pkg/debugger/server.go +++ b/ignite/pkg/debugger/server.go @@ -124,7 +124,7 @@ func Start(ctx context.Context, binaryPath string, options ...Option) (err error return fmt.Errorf("failed to run debug server: %w", err) } - defer server.Stop() + defer server.Stop() //nolint:errcheck // Wait until the context is done or the connected client disconnects select { diff --git a/ignite/pkg/jsonfile/jsonfile_test.go b/ignite/pkg/jsonfile/jsonfile_test.go index edb243b6ab..455eeabca1 100644 --- a/ignite/pkg/jsonfile/jsonfile_test.go +++ b/ignite/pkg/jsonfile/jsonfile_test.go @@ -240,7 +240,8 @@ func TestJSONFile_Update(t *testing.T) { } for key, value := range updates { newValue := value - err = f.Field(key, &newValue) + err := f.Field(key, &newValue) + require.NoError(t, err) require.Equal(t, value, newValue) } }) diff --git a/ignite/pkg/looseerrgroup/looseerrgroup.go b/ignite/pkg/looseerrgroup/looseerrgroup.go index 8e5302b0a4..d1661c9fce 100644 --- a/ignite/pkg/looseerrgroup/looseerrgroup.go +++ b/ignite/pkg/looseerrgroup/looseerrgroup.go @@ -14,7 +14,7 @@ import ( func Wait(ctx context.Context, g *errgroup.Group) error { doneC := make(chan struct{}) - go func() { g.Wait(); close(doneC) }() + go func() { _ = g.Wait(); close(doneC) }() select { case <-ctx.Done(): diff --git a/ignite/pkg/openapiconsole/console.go b/ignite/pkg/openapiconsole/console.go index 36ffef8f4f..6c430d95ed 100644 --- a/ignite/pkg/openapiconsole/console.go +++ b/ignite/pkg/openapiconsole/console.go @@ -14,7 +14,7 @@ func Handler(title, specURL string) http.HandlerFunc { t, _ := template.ParseFS(index, "index.tpl") return func(w http.ResponseWriter, req *http.Request) { - t.Execute(w, struct { + _ = t.Execute(w, struct { Title string URL string }{ diff --git a/ignite/pkg/truncatedbuffer/truncatedbuffer_test.go b/ignite/pkg/truncatedbuffer/truncatedbuffer_test.go index 312cdbba17..3f21397b3a 100644 --- a/ignite/pkg/truncatedbuffer/truncatedbuffer_test.go +++ b/ignite/pkg/truncatedbuffer/truncatedbuffer_test.go @@ -1,7 +1,7 @@ package truncatedbuffer import ( - "math/rand" + "crypto/rand" "testing" "github.com/stretchr/testify/require" @@ -9,9 +9,12 @@ import ( func TestWriter(t *testing.T) { ranBytes10 := make([]byte, 10) - rand.Read(ranBytes10) + _, err := rand.Read(ranBytes10) + require.NoError(t, err) + ranBytes1000 := make([]byte, 1000) - rand.Read(ranBytes1000) + _, err = rand.Read(ranBytes1000) + require.NoError(t, err) // TruncatedBuffer has a max capacity b := NewTruncatedBuffer(100) diff --git a/ignite/pkg/xgenny/xgenny.go b/ignite/pkg/xgenny/xgenny.go index 4338a58c7f..6d9de723c8 100644 --- a/ignite/pkg/xgenny/xgenny.go +++ b/ignite/pkg/xgenny/xgenny.go @@ -39,7 +39,10 @@ func (w Walker) walkDir(wl packd.WalkFunc, path string) error { for _, entry := range entries { if entry.IsDir() { - w.walkDir(wl, filepath.Join(path, entry.Name())) + err := w.walkDir(wl, filepath.Join(path, entry.Name())) + if err != nil { + return err + } continue } @@ -57,7 +60,9 @@ func (w Walker) walkDir(wl packd.WalkFunc, path string) error { return err } - wl(trimPath, f) + if err := wl(trimPath, f); err != nil { + return err + } } return nil diff --git a/ignite/pkg/xhttp/response.go b/ignite/pkg/xhttp/response.go index a833c602d4..8212580885 100644 --- a/ignite/pkg/xhttp/response.go +++ b/ignite/pkg/xhttp/response.go @@ -23,7 +23,7 @@ func ResponseJSON(w http.ResponseWriter, status int, data interface{}) error { } w.Header().Set("Content-Type", "application/json") w.WriteHeader(status) - w.Write(bz) + _, _ = w.Write(bz) return err } diff --git a/ignite/pkg/xhttp/server.go b/ignite/pkg/xhttp/server.go index 16f017b6ee..0fb3494eed 100644 --- a/ignite/pkg/xhttp/server.go +++ b/ignite/pkg/xhttp/server.go @@ -18,7 +18,7 @@ func Serve(ctx context.Context, s *http.Server) error { shutdownCtx, cancel := context.WithTimeout(context.Background(), ShutdownTimeout) defer cancel() - s.Shutdown(shutdownCtx) + _ = s.Shutdown(shutdownCtx) }() err := s.ListenAndServe() diff --git a/ignite/services/chain/runtime.go b/ignite/services/chain/runtime.go index 72a8d1be24..fb7e8bf9b9 100644 --- a/ignite/services/chain/runtime.go +++ b/ignite/services/chain/runtime.go @@ -100,7 +100,9 @@ func (c Chain) appTOML(homePath string, cfg *chainconfig.Config) error { appConfig.Set("minimum-gas-prices", gas.String()) // Update config values with the validator's Cosmos SDK app config - updateTomlTreeValues(appConfig, validator.App) + if err := updateTomlTreeValues(appConfig, validator.App); err != nil { + return err + } // Make sure the API address have the protocol prefix appConfig.Set("api.address", apiAddr) @@ -150,7 +152,9 @@ func (c Chain) configTOML(homePath string, cfg *chainconfig.Config) error { tmConfig.Set("consensus.timeout_propose", "1s") // Update config values with the validator's Tendermint config - updateTomlTreeValues(tmConfig, validator.Config) + if err := updateTomlTreeValues(tmConfig, validator.Config); err != nil { + return err + } // Make sure the addresses have the protocol prefix tmConfig.Set("rpc.laddr", rpcAddr) @@ -187,7 +191,9 @@ func (c Chain) clientTOML(homePath string, cfg *chainconfig.Config) error { tmConfig.Set("broadcast-mode", "sync") // Update config values with the validator's client config - updateTomlTreeValues(tmConfig, validator.Client) + if err := updateTomlTreeValues(tmConfig, validator.Client); err != nil { + return err + } file, err := os.OpenFile(path, os.O_RDWR|os.O_TRUNC, 0o644) if err != nil { diff --git a/ignite/services/doctor/doctor.go b/ignite/services/doctor/doctor.go index 95f873ea63..87e07b7e9c 100644 --- a/ignite/services/doctor/doctor.go +++ b/ignite/services/doctor/doctor.go @@ -76,8 +76,10 @@ func (d *Doctor) MigrateConfig(_ context.Context) error { status := "OK" if version != chainconfig.LatestVersion { - f.Seek(0, 0) - + _, err := f.Seek(0, 0) + if err != nil { + return errf(fmt.Errorf("failed to reset the file: %w", err)) + } // migrate config file // Convert the current config to the latest version and update the YAML file var buf bytes.Buffer diff --git a/ignite/services/plugin/interface.go b/ignite/services/plugin/interface.go index b423f8485e..6c2e837aaf 100644 --- a/ignite/services/plugin/interface.go +++ b/ignite/services/plugin/interface.go @@ -271,31 +271,52 @@ func (f Flag) feedFlagSet(fgr flagger) error { case FlagTypeBool: defVal, _ := strconv.ParseBool(f.DefValue) fs.BoolP(f.Name, f.Shorthand, defVal, f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeInt: defVal, _ := strconv.Atoi(f.DefValue) fs.IntP(f.Name, f.Shorthand, defVal, f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeUint: defVal, _ := strconv.ParseUint(f.DefValue, 10, 64) fs.UintP(f.Name, f.Shorthand, uint(defVal), f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeInt64: defVal, _ := strconv.ParseInt(f.DefValue, 10, 64) fs.Int64P(f.Name, f.Shorthand, defVal, f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeUint64: defVal, _ := strconv.ParseUint(f.DefValue, 10, 64) fs.Uint64P(f.Name, f.Shorthand, defVal, f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeString: fs.StringP(f.Name, f.Shorthand, f.DefValue, f.Usage) - fs.Set(f.Name, f.Value) + err := fs.Set(f.Name, f.Value) + if err != nil { + return err + } case FlagTypeStringSlice: s := strings.Trim(f.DefValue, "[]") defValue := strings.Fields(s) fs.StringSliceP(f.Name, f.Shorthand, defValue, f.Usage) - fs.Set(f.Name, strings.Trim(f.Value, "[]")) + err := fs.Set(f.Name, strings.Trim(f.Value, "[]")) + if err != nil { + return err + } default: return fmt.Errorf("flagset unmarshal: unhandled flag type %q in flag %#v", f.Type, f) } diff --git a/ignite/services/plugin/plugin.go b/ignite/services/plugin/plugin.go index 0081c381c1..240effab4d 100644 --- a/ignite/services/plugin/plugin.go +++ b/ignite/services/plugin/plugin.go @@ -187,7 +187,7 @@ func (p *Plugin) KillClient() { } if p.isHost { - deleteConfCache(p.Path) + _ = deleteConfCache(p.Path) p.isHost = false } } diff --git a/ignite/services/plugin/plugin_test.go b/ignite/services/plugin/plugin_test.go index da3795b913..b3e6682dd0 100644 --- a/ignite/services/plugin/plugin_test.go +++ b/ignite/services/plugin/plugin_test.go @@ -503,7 +503,8 @@ func scaffoldPlugin(t *testing.T, dir, name string, sharedHost bool) string { modpath, err := gocmd.Env(gocmd.EnvGOMOD) require.NoError(err) modpath = filepath.Dir(modpath) - gomod.AddReplace("github.com/ignite/cli", "", modpath, "") + err = gomod.AddReplace("github.com/ignite/cli", "", modpath, "") + require.NoError(err) // Save go.mod data, err := gomod.Format() require.NoError(err) diff --git a/integration/network/network_test.go b/integration/network/network_test.go index 0761c3601a..092ddd13fb 100644 --- a/integration/network/network_test.go +++ b/integration/network/network_test.go @@ -1,3 +1,4 @@ +//nolint:unused package network_test import ( diff --git a/integration/node/cmd_query_bank_test.go b/integration/node/cmd_query_bank_test.go index ab3863125d..36f164fe07 100644 --- a/integration/node/cmd_query_bank_test.go +++ b/integration/node/cmd_query_bank_test.go @@ -37,7 +37,7 @@ func assertBankBalanceOutput(t *testing.T, output string, balances string) { table = append(table, []string{c.Amount.String(), c.Denom}) } var expectedBalances strings.Builder - entrywriter.MustWrite(&expectedBalances, []string{"Amount", "Denom"}, table...) + _ = entrywriter.MustWrite(&expectedBalances, []string{"Amount", "Denom"}, table...) assert.Contains(t, output, expectedBalances.String()) } From 52cdb2143c000ac78b9c201adab5714cc09acf4d Mon Sep 17 00:00:00 2001 From: Pantani Date: Fri, 13 Oct 2023 02:01:29 +0200 Subject: [PATCH 02/10] remove panic from faucet responses --- ignite/pkg/cosmosfaucet/http_faucet.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/ignite/pkg/cosmosfaucet/http_faucet.go b/ignite/pkg/cosmosfaucet/http_faucet.go index 1a1d3b0039..5eff67c0f9 100644 --- a/ignite/pkg/cosmosfaucet/http_faucet.go +++ b/ignite/pkg/cosmosfaucet/http_faucet.go @@ -69,13 +69,10 @@ type FaucetInfoResponse struct { } func (f Faucet) faucetInfoHandler(w http.ResponseWriter, _ *http.Request) { - err := xhttp.ResponseJSON(w, http.StatusOK, FaucetInfoResponse{ + _ = xhttp.ResponseJSON(w, http.StatusOK, FaucetInfoResponse{ IsAFaucet: true, ChainID: f.chainID, }) - if err != nil { - panic(err) - } } // coinsFromRequest determines tokens to transfer from transfer request. @@ -97,17 +94,11 @@ func (f Faucet) coinsFromRequest(req TransferRequest) (sdk.Coins, error) { } func responseSuccess(w http.ResponseWriter) { - err := xhttp.ResponseJSON(w, http.StatusOK, TransferResponse{}) - if err != nil { - panic(err) - } + _ = xhttp.ResponseJSON(w, http.StatusOK, TransferResponse{}) } func responseError(w http.ResponseWriter, code int, err error) { - errResp := xhttp.ResponseJSON(w, code, TransferResponse{ + _ = xhttp.ResponseJSON(w, code, TransferResponse{ Error: err.Error(), }) - if errResp != nil { - panic(errResp) - } } From bde20e640ee3317b625b0c21499197f34d565b21 Mon Sep 17 00:00:00 2001 From: Pantani Date: Fri, 13 Oct 2023 17:47:30 +0200 Subject: [PATCH 03/10] improve jsonfile tests --- ignite/pkg/jsonfile/jsonfile.go | 27 +++++++++++++------ ignite/pkg/jsonfile/jsonfile_test.go | 40 ++++++++++++++++++---------- 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/ignite/pkg/jsonfile/jsonfile.go b/ignite/pkg/jsonfile/jsonfile.go index 5738422a4e..1687c29717 100644 --- a/ignite/pkg/jsonfile/jsonfile.go +++ b/ignite/pkg/jsonfile/jsonfile.go @@ -180,20 +180,31 @@ func (f *JSONFile) Field(key string, param interface{}) error { switch dataType { case jsonparser.Boolean, jsonparser.Array, jsonparser.Number, jsonparser.Object: err := json.Unmarshal(value, param) - if _, ok := err.(*json.UnmarshalTypeError); ok { //nolint:errorlint + var unmarshalTypeError *json.UnmarshalTypeError + if errors.As(err, &unmarshalTypeError) { //nolint:errorlint return ErrInvalidValueType - } else if err != nil { - return err } case jsonparser.String: - paramStr, ok := param.(*string) - if !ok { - return ErrInvalidValueType - } - *paramStr, err = jsonparser.ParseString(value) + result, err := jsonparser.ParseString(value) if err != nil { return err } + paramStr, ok := param.(*string) + if ok { + *paramStr = result + break + } + if _, ok := param.(interface{}); ok { + err := json.Unmarshal(value, param) + var unmarshalTypeError *json.UnmarshalTypeError + var syntaxTypeError *json.SyntaxError + if errors.As(err, &unmarshalTypeError) || + errors.As(err, &syntaxTypeError) { //nolint:errorlint + return ErrInvalidValueType + } + break + } + return ErrInvalidValueType case jsonparser.NotExist: case jsonparser.Null: case jsonparser.Unknown: diff --git a/ignite/pkg/jsonfile/jsonfile_test.go b/ignite/pkg/jsonfile/jsonfile_test.go index 455eeabca1..da2e073c39 100644 --- a/ignite/pkg/jsonfile/jsonfile_test.go +++ b/ignite/pkg/jsonfile/jsonfile_test.go @@ -115,13 +115,15 @@ func TestJSONFile_Field(t *testing.T) { } func TestJSONFile_Update(t *testing.T) { - jsonCoins, err := json.Marshal(sdk.NewCoin("bar", sdk.NewInt(500))) + coins := sdk.NewCoin("bar", sdk.NewInt(500)) + jsonCoins, err := json.Marshal(coins) require.NoError(t, err) tests := []struct { name string filepath string opts []UpdateFileOption + want []interface{} err error }{ { @@ -133,6 +135,7 @@ func TestJSONFile_Update(t *testing.T) { "22020096", ), }, + want: []interface{}{float64(22020096)}, }, { name: "update string field to number", @@ -143,6 +146,7 @@ func TestJSONFile_Update(t *testing.T) { 22020096, ), }, + want: []interface{}{float64(22020096)}, }, { name: "update number field", @@ -153,9 +157,10 @@ func TestJSONFile_Update(t *testing.T) { 1000, ), }, + want: []interface{}{float64(1000)}, }, { - name: "update coin field", + name: "update timestamp field", filepath: "testdata/jsonfile.json", opts: []UpdateFileOption{ WithKeyValueTimestamp( @@ -163,9 +168,10 @@ func TestJSONFile_Update(t *testing.T) { 10000000, ), }, + want: nil, // TODO find a way to test timestamp values }, { - name: "update all values type", + name: "update two values type", filepath: "testdata/jsonfile.json", opts: []UpdateFileOption{ WithKeyValue( @@ -176,14 +182,11 @@ func TestJSONFile_Update(t *testing.T) { "consensus_params.block.time_iota_ms", 1000, ), - WithKeyValueTimestamp( - "genesis_time", - 999999999, - ), }, + want: []interface{}{float64(3000000), float64(1000)}, }, { - name: "update bytes", + name: "update coin field", filepath: "testdata/jsonfile.json", opts: []UpdateFileOption{ WithKeyValueByte( @@ -191,6 +194,10 @@ func TestJSONFile_Update(t *testing.T) { jsonCoins, ), }, + want: []interface{}{map[string]interface{}{ + "denom": coins.Denom, + "amount": coins.Amount.String(), + }}, }, { name: "add non-existing field", @@ -201,6 +208,7 @@ func TestJSONFile_Update(t *testing.T) { "111", ), }, + want: []interface{}{float64(111)}, }, } for _, tt := range tests { @@ -238,11 +246,15 @@ func TestJSONFile_Update(t *testing.T) { for _, opt := range tt.opts { opt(updates) } - for key, value := range updates { - newValue := value - err := f.Field(key, &newValue) - require.NoError(t, err) - require.Equal(t, value, newValue) + if tt.want != nil { + got := make([]interface{}, 0) + for key := range updates { + var newValue interface{} + err := f.Field(key, &newValue) + require.NoError(t, err) + got = append(got, newValue) + } + require.ElementsMatch(t, tt.want, got) } }) } @@ -334,7 +346,7 @@ func TestFromURL(t *testing.T) { { name: "invalid link", args: args{ - url: "https://github.com/invalid_example.json", + url: "https://google.com/invalid_example.json", }, err: ErrInvalidURL, }, From 113fcf624c639428062cda292958f4df9cd3429e Mon Sep 17 00:00:00 2001 From: Pantani Date: Mon, 16 Oct 2023 23:47:39 +0200 Subject: [PATCH 04/10] fix some lint issues --- ignite/pkg/cosmosanalysis/app/app.go | 13 +++++++------ ignite/pkg/jsonfile/jsonfile.go | 4 ++-- ignite/pkg/placeholder/error.go | 4 +++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ignite/pkg/cosmosanalysis/app/app.go b/ignite/pkg/cosmosanalysis/app/app.go index b240fe86da..276b61f780 100644 --- a/ignite/pkg/cosmosanalysis/app/app.go +++ b/ignite/pkg/cosmosanalysis/app/app.go @@ -217,31 +217,32 @@ func newUnexpectedTypeErr(n any) error { return errors.Errorf("unexpected type %T", n) } -func findBasicManagerRegistrations(n ast.Node, pkgDir string, fileImports map[string]string) (packages []string, err error) { +func findBasicManagerRegistrations(n ast.Node, pkgDir string, fileImports map[string]string) ([]string, error) { callExprType, ok := n.(*ast.CallExpr) if !ok { - return + return nil, nil } selectorExprType, ok := callExprType.Fun.(*ast.SelectorExpr) if !ok { - return + return nil, nil } identExprType, ok := selectorExprType.X.(*ast.Ident) if !ok { - return + return nil, nil } basicModulePkgName := findBasicManagerPkgName(fileImports) if basicModulePkgName == "" { // cosmos-sdk/types/module is not imported in this file, skip - return + return nil, nil } if identExprType.Name != basicModulePkgName || selectorExprType.Sel.Name != "NewBasicManager" { - return + return nil, nil } // Node "n" defines the call to NewBasicManager, let's loop on its args to discover modules + packages := make([]string, 0) for _, arg := range callExprType.Args { switch v := arg.(type) { diff --git a/ignite/pkg/jsonfile/jsonfile.go b/ignite/pkg/jsonfile/jsonfile.go index 1687c29717..0fb3b6a0a1 100644 --- a/ignite/pkg/jsonfile/jsonfile.go +++ b/ignite/pkg/jsonfile/jsonfile.go @@ -181,7 +181,7 @@ func (f *JSONFile) Field(key string, param interface{}) error { case jsonparser.Boolean, jsonparser.Array, jsonparser.Number, jsonparser.Object: err := json.Unmarshal(value, param) var unmarshalTypeError *json.UnmarshalTypeError - if errors.As(err, &unmarshalTypeError) { //nolint:errorlint + if errors.As(err, &unmarshalTypeError) { return ErrInvalidValueType } case jsonparser.String: @@ -199,7 +199,7 @@ func (f *JSONFile) Field(key string, param interface{}) error { var unmarshalTypeError *json.UnmarshalTypeError var syntaxTypeError *json.SyntaxError if errors.As(err, &unmarshalTypeError) || - errors.As(err, &syntaxTypeError) { //nolint:errorlint + errors.As(err, &syntaxTypeError) { return ErrInvalidValueType } break diff --git a/ignite/pkg/placeholder/error.go b/ignite/pkg/placeholder/error.go index a649d95a12..cfa6e9c99b 100644 --- a/ignite/pkg/placeholder/error.go +++ b/ignite/pkg/placeholder/error.go @@ -1,6 +1,7 @@ package placeholder import ( + "errors" "fmt" "strings" @@ -18,7 +19,8 @@ type MissingPlaceholdersError struct { // Is true if both errors have the same list of missing placeholders. func (e *MissingPlaceholdersError) Is(err error) bool { - other, ok := err.(*MissingPlaceholdersError) //nolint:errorlint + var other *MissingPlaceholdersError + ok := errors.As(err, &other) if !ok { return false } From e9d0b61a4e2df4ba6bd2bb55c0065d710f926e17 Mon Sep 17 00:00:00 2001 From: Pantani Date: Mon, 16 Oct 2023 23:48:46 +0200 Subject: [PATCH 05/10] remove unused file --- .../modules/runtime_api_routes/go.sum | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum diff --git a/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum b/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum deleted file mode 100644 index 4ad5118b36..0000000000 --- a/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum +++ /dev/null @@ -1,111 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= -cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= -cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/bufbuild/buf v1.23.1/go.mod h1:ERFRzJiIjAOzUSJ3vz1zoI7XfxlBnCwZEyL+NJm4pko= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= -github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= -github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From d42a5963724de99557570f98cda304f9c1c335ab Mon Sep 17 00:00:00 2001 From: Pantani Date: Tue, 17 Oct 2023 00:03:01 +0200 Subject: [PATCH 06/10] fix more lint issue --- ignite/pkg/cache/cache.go | 5 +++-- ignite/pkg/jsonfile/jsonfile.go | 17 +++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ignite/pkg/cache/cache.go b/ignite/pkg/cache/cache.go index 061818ed5c..02a6982167 100644 --- a/ignite/pkg/cache/cache.go +++ b/ignite/pkg/cache/cache.go @@ -91,10 +91,11 @@ func (c Cache[T]) Put(key string, value T) error { // Get fetches the value of key within the namespace. // If no value exists, it will return found == false. -func (c Cache[T]) Get(key string) (val T, err error) { +func (c Cache[T]) Get(key string) (T, error) { + var val T db, err := openDB(c.storage.storagePath) if err != nil { - return + return val, err } defer db.Close() diff --git a/ignite/pkg/jsonfile/jsonfile.go b/ignite/pkg/jsonfile/jsonfile.go index 0fb3b6a0a1..7ee796be6b 100644 --- a/ignite/pkg/jsonfile/jsonfile.go +++ b/ignite/pkg/jsonfile/jsonfile.go @@ -194,17 +194,14 @@ func (f *JSONFile) Field(key string, param interface{}) error { *paramStr = result break } - if _, ok := param.(interface{}); ok { - err := json.Unmarshal(value, param) - var unmarshalTypeError *json.UnmarshalTypeError - var syntaxTypeError *json.SyntaxError - if errors.As(err, &unmarshalTypeError) || - errors.As(err, &syntaxTypeError) { - return ErrInvalidValueType - } - break + var ( + unmarshalTypeError *json.UnmarshalTypeError + syntaxTypeError *json.SyntaxError + ) + if err := json.Unmarshal(value, param); errors.As(err, &unmarshalTypeError) || + errors.As(err, &syntaxTypeError) { + return ErrInvalidValueType } - return ErrInvalidValueType case jsonparser.NotExist: case jsonparser.Null: case jsonparser.Unknown: From b61c373949e7cf356abc701278a5a653033e546d Mon Sep 17 00:00:00 2001 From: Pantani Date: Tue, 17 Oct 2023 00:42:28 +0200 Subject: [PATCH 07/10] fix error handler for plugins tests --- ignite/cmd/plugin_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ignite/cmd/plugin_test.go b/ignite/cmd/plugin_test.go index abb51f5a18..3bccc5b2f5 100644 --- a/ignite/cmd/plugin_test.go +++ b/ignite/cmd/plugin_test.go @@ -332,9 +332,7 @@ ignite rootCmd := buildRootCmd() tt.setup(t, pi) - err := linkPlugins(rootCmd, []*plugin.Plugin{p}) - require.NoError(err) - + _ = linkPlugins(rootCmd, []*plugin.Plugin{p}) if tt.expectedError != "" { require.Error(p.Error) require.EqualError(p.Error, tt.expectedError) @@ -541,9 +539,7 @@ func TestLinkPluginHooks(t *testing.T) { rootCmd := buildRootCmd() tt.setup(t, pi) - err := linkPlugins(rootCmd, []*plugin.Plugin{p}) - require.NoError(err) - + _ = linkPlugins(rootCmd, []*plugin.Plugin{p}) if tt.expectedError != "" { require.EqualError(p.Error, tt.expectedError) return From 13f537aa09a45b9c5a6f6ebad27a164fc28cfa64 Mon Sep 17 00:00:00 2001 From: Pantani Date: Tue, 17 Oct 2023 12:24:07 +0200 Subject: [PATCH 08/10] rollback some test assertions --- ignite/cmd/plugin_test.go | 2 ++ ignite/services/plugin/interface.go | 35 ++++++----------------------- 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/ignite/cmd/plugin_test.go b/ignite/cmd/plugin_test.go index 3bccc5b2f5..e8e154f62f 100644 --- a/ignite/cmd/plugin_test.go +++ b/ignite/cmd/plugin_test.go @@ -333,6 +333,7 @@ ignite tt.setup(t, pi) _ = linkPlugins(rootCmd, []*plugin.Plugin{p}) + if tt.expectedError != "" { require.Error(p.Error) require.EqualError(p.Error, tt.expectedError) @@ -540,6 +541,7 @@ func TestLinkPluginHooks(t *testing.T) { tt.setup(t, pi) _ = linkPlugins(rootCmd, []*plugin.Plugin{p}) + if tt.expectedError != "" { require.EqualError(p.Error, tt.expectedError) return diff --git a/ignite/services/plugin/interface.go b/ignite/services/plugin/interface.go index 6c2e837aaf..9a735d1fad 100644 --- a/ignite/services/plugin/interface.go +++ b/ignite/services/plugin/interface.go @@ -271,52 +271,31 @@ func (f Flag) feedFlagSet(fgr flagger) error { case FlagTypeBool: defVal, _ := strconv.ParseBool(f.DefValue) fs.BoolP(f.Name, f.Shorthand, defVal, f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeInt: defVal, _ := strconv.Atoi(f.DefValue) fs.IntP(f.Name, f.Shorthand, defVal, f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeUint: defVal, _ := strconv.ParseUint(f.DefValue, 10, 64) fs.UintP(f.Name, f.Shorthand, uint(defVal), f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeInt64: defVal, _ := strconv.ParseInt(f.DefValue, 10, 64) fs.Int64P(f.Name, f.Shorthand, defVal, f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeUint64: defVal, _ := strconv.ParseUint(f.DefValue, 10, 64) fs.Uint64P(f.Name, f.Shorthand, defVal, f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeString: fs.StringP(f.Name, f.Shorthand, f.DefValue, f.Usage) - err := fs.Set(f.Name, f.Value) - if err != nil { - return err - } + _ = fs.Set(f.Name, f.Value) case FlagTypeStringSlice: s := strings.Trim(f.DefValue, "[]") defValue := strings.Fields(s) fs.StringSliceP(f.Name, f.Shorthand, defValue, f.Usage) - err := fs.Set(f.Name, strings.Trim(f.Value, "[]")) - if err != nil { - return err - } + _ = fs.Set(f.Name, strings.Trim(f.Value, "[]")) default: return fmt.Errorf("flagset unmarshal: unhandled flag type %q in flag %#v", f.Type, f) } From 0299ab55655b935c2b2574400de1b9b78f32ed62 Mon Sep 17 00:00:00 2001 From: Pantani Date: Wed, 18 Oct 2023 15:18:26 +0200 Subject: [PATCH 09/10] rollback lint ci file --- .github/workflows/test-lint.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml index 8f4b4e8a37..9da1c01b40 100644 --- a/.github/workflows/test-lint.yml +++ b/.github/workflows/test-lint.yml @@ -36,7 +36,6 @@ jobs: if: env.GIT_DIFF with: version: v1.54.2 - skip-cache: true install-mode: goinstall - args: --timeout 20m + args: --timeout 10m github-token: ${{ secrets.github_token }} From 204ed784d084a9d3ca9f4a38162adb6a875227f9 Mon Sep 17 00:00:00 2001 From: Pantani Date: Wed, 18 Oct 2023 15:19:57 +0200 Subject: [PATCH 10/10] remove unused files and comments --- ignite/pkg/cache/cache.go | 3 +- .../modules/runtime_api_routes/go.sum | 111 ------------------ .../pkg/cosmosanalysis/cosmosanalysis_test.go | 2 +- 3 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum diff --git a/ignite/pkg/cache/cache.go b/ignite/pkg/cache/cache.go index 02a6982167..ad115d7888 100644 --- a/ignite/pkg/cache/cache.go +++ b/ignite/pkg/cache/cache.go @@ -91,8 +91,7 @@ func (c Cache[T]) Put(key string, value T) error { // Get fetches the value of key within the namespace. // If no value exists, it will return found == false. -func (c Cache[T]) Get(key string) (T, error) { - var val T +func (c Cache[T]) Get(key string) (val T, err error) { db, err := openDB(c.storage.storagePath) if err != nil { return val, err diff --git a/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum b/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum deleted file mode 100644 index 4ad5118b36..0000000000 --- a/ignite/pkg/cosmosanalysis/app/testdata/modules/runtime_api_routes/go.sum +++ /dev/null @@ -1,111 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= -cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= -cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= -cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/bufbuild/buf v1.23.1/go.mod h1:ERFRzJiIjAOzUSJ3vz1zoI7XfxlBnCwZEyL+NJm4pko= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= -github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= -github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= -github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= -github.com/cosmos/ibc-go/v7 v7.2.0/go.mod h1:OOcjKIRku/j1Xs1RgKK0yvKRrJ5iFuZYMetR1n3yMlc= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2/go.mod h1:7pdNwVWBBHGiCxa9lAszqCJMbfTISJ7oMftp8+UGV08= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go b/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go index c3c7149d40..f0421a523b 100644 --- a/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go +++ b/ignite/pkg/cosmosanalysis/cosmosanalysis_test.go @@ -191,7 +191,7 @@ func TestFindAppFilePath(t *testing.T) { appTestFilePath := filepath.Join(secondaryAppFolder, "my_own_app_test.go") err = os.WriteFile(appTestFilePath, appTestFile, 0o644) require.NoError(t, err) - _, err = cosmosanalysis.FindAppFilePath(tmpDir) //nolint:ineffassign + _, err = cosmosanalysis.FindAppFilePath(tmpDir) require.Error(t, err) require.Contains(t, err.Error(), "cannot locate your app.go")