Skip to content

Commit 1b19eba

Browse files
Maxxlab
Max
authored and
xlab
committed
chore: fix linter
1 parent 14cdb34 commit 1b19eba

File tree

16 files changed

+91
-52
lines changed

16 files changed

+91
-52
lines changed

‎.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ run:
33
skip-files:
44
- schema/applications/base/application.go
55
- utilities/cuckoo/filter.go
6+
- x/lsnative/distribution/types/distribution.pb.go
67
skip-dirs:
78
- x/lsnative
9+
- ibctesting
810
linters:
911
disable-all: false
1012
enable:

‎simapp/helpers/test_helpers.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,17 @@ func GenSignedMockTx(r *rand.Rand, txConfig client.TxConfig, msgs []sdk.Msg, fee
3939
}
4040

4141
tx := txConfig.NewTxBuilder()
42+
4243
err := tx.SetMsgs(msgs...)
4344
if err != nil {
4445
return nil, err
4546
}
47+
4648
err = tx.SetSignatures(sigs...)
4749
if err != nil {
4850
return nil, err
4951
}
52+
5053
tx.SetMemo(memo)
5154
tx.SetFeeAmount(feeAmt)
5255
tx.SetGasLimit(gas)
@@ -60,15 +63,19 @@ func GenSignedMockTx(r *rand.Rand, txConfig client.TxConfig, msgs []sdk.Msg, fee
6063
Sequence: accSeqs[i],
6164
PubKey: p.PubKey(),
6265
}
66+
6367
signBytes, err := txConfig.SignModeHandler().GetSignBytes(signMode, signerData, tx.GetTx())
6468
if err != nil {
6569
panic(err)
6670
}
71+
6772
sig, err := p.Sign(signBytes)
6873
if err != nil {
6974
panic(err)
7075
}
76+
7177
sigs[i].Data.(*signing.SingleSignatureData).Signature = sig
78+
7279
err = tx.SetSignatures(sigs...)
7380
if err != nil {
7481
panic(err)

‎simapp/simd/cmd/cmd_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"github.com/stretchr/testify/require"
88

99
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
10-
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/client/cli"
1110
"github.com/persistenceOne/persistence-sdk/v2/simapp"
1211
"github.com/persistenceOne/persistence-sdk/v2/simapp/simd/cmd"
12+
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/client/cli"
1313
)
1414

1515
func TestInitCmd(t *testing.T) {

‎testutil/network/network.go

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func NewAppConstructor(encodingCfg params.EncodingConfig) AppConstructor {
6969

7070
// Config defines the necessary configuration used to bootstrap and start an
7171
// in-process local testing network.
72-
type Config struct {
72+
type Config struct { //nolint: maligned // not important
7373
Codec codec.Codec
7474
LegacyAmino *codec.LegacyAmino // TODO: Remove!
7575
InterfaceRegistry codectypes.InterfaceRegistry
@@ -250,6 +250,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
250250
appCfg.GRPC.Enable = false
251251
appCfg.GRPCWeb.Enable = false
252252
apiListenAddr := ""
253+
253254
if i == 0 {
254255
if cfg.APIAddress != "" {
255256
apiListenAddr = cfg.APIAddress
@@ -262,10 +263,12 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
262263
}
263264

264265
appCfg.API.Address = apiListenAddr
266+
265267
apiURL, err := url.Parse(apiListenAddr)
266268
if err != nil {
267269
return nil, err
268270
}
271+
269272
apiAddr = fmt.Sprintf("http://%s:%s", apiURL.Hostname(), apiURL.Port())
270273

271274
if cfg.RPCAddress != "" {
@@ -287,17 +290,20 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
287290
}
288291
appCfg.GRPC.Address = fmt.Sprintf("0.0.0.0:%s", grpcPort)
289292
}
293+
290294
appCfg.GRPC.Enable = true
291295

292296
_, grpcWebPort, err := server.FreeTCPAddr()
293297
if err != nil {
294298
return nil, err
295299
}
300+
296301
appCfg.GRPCWeb.Address = fmt.Sprintf("0.0.0.0:%s", grpcWebPort)
297302
appCfg.GRPCWeb.Enable = true
298303
}
299304

300305
logger := server.ZeroLogWrapper{Logger: zerolog.Nop()}
306+
301307
if cfg.EnableTMLogging {
302308
logWriter := zerolog.ConsoleWriter{Out: os.Stderr}
303309
logger = server.ZeroLogWrapper{Logger: zerolog.New(logWriter).Level(zerolog.InfoLevel).With().Timestamp().Logger()}
@@ -328,6 +334,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
328334
if err != nil {
329335
return nil, err
330336
}
337+
331338
tmCfg.ProxyApp = proxyAddr
332339

333340
p2pAddr, _, err := server.FreeTCPAddr()
@@ -353,6 +360,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
353360
}
354361

355362
keyringAlgos, _ := kb.SupportedAlgorithms()
363+
356364
algo, err := keyring.NewSigningAlgoFromString(cfg.SigningAlgo, keyringAlgos)
357365
if err != nil {
358366
return nil, err
@@ -375,6 +383,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
375383
}
376384

377385
info := map[string]string{"secret": secret}
386+
378387
infoBz, err := json.Marshal(info)
379388
if err != nil {
380389
return nil, err
@@ -419,10 +428,12 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
419428
memo := fmt.Sprintf("%s@%s:%s", nodeIDs[i], p2pURL.Hostname(), p2pURL.Port())
420429
fee := sdk.NewCoins(sdk.NewCoin(fmt.Sprintf("%stoken", nodeDirName), sdk.NewInt(0)))
421430
txBuilder := cfg.TxConfig.NewTxBuilder()
431+
422432
err = txBuilder.SetMsgs(createValMsg)
423433
if err != nil {
424434
return nil, err
425435
}
436+
426437
txBuilder.SetFeeAmount(fee) // Arbitrary fee
427438
txBuilder.SetGasLimit(1000000) // Need at least 100386
428439
txBuilder.SetMemo(memo)
@@ -443,6 +454,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
443454
if err != nil {
444455
return nil, err
445456
}
457+
446458
err = writeFile(fmt.Sprintf("%v.json", nodeDirName), gentxsDir, txBz)
447459
if err != nil {
448460
return nil, err
@@ -481,17 +493,20 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) {
481493
if err != nil {
482494
return nil, err
483495
}
496+
484497
err = collectGenFiles(cfg, network.Validators, network.BaseDir)
485498
if err != nil {
486499
return nil, err
487500
}
488501

489502
l.Log("starting test network...")
503+
490504
for idx, v := range network.Validators {
491505
err := startInProcess(cfg, v)
492506
if err != nil {
493507
return nil, err
494508
}
509+
495510
l.Log("started validator", idx)
496511
}
497512

@@ -535,16 +550,19 @@ func (n *Network) WaitForHeight(h int64) (int64, error) {
535550
// provide a custom timeout.
536551
func (n *Network) WaitForHeightWithTimeout(h int64, t time.Duration) (int64, error) {
537552
ticker := time.NewTicker(time.Second)
553+
538554
defer ticker.Stop()
539555

540556
timeout := time.NewTimer(t)
557+
541558
defer timeout.Stop()
542559

543560
if len(n.Validators) == 0 {
544561
return 0, errors.New("no validators available")
545562
}
546563

547564
var latestHeight int64
565+
548566
val := n.Validators[0]
549567

550568
for {
@@ -602,6 +620,7 @@ func (n *Network) Cleanup() {
602620

603621
if v.grpc != nil {
604622
v.grpc.Stop()
623+
605624
if v.grpcWeb != nil {
606625
_ = v.grpcWeb.Close()
607626
}
@@ -645,9 +664,11 @@ func printMnemonic(l Logger, secret string) {
645664

646665
l.Log("\n")
647666
l.Log(strings.Repeat("+", maxLineLength+8))
667+
648668
for _, line := range lines {
649669
l.Logf("++ %s ++\n", centerText(line, maxLineLength))
650670
}
671+
651672
l.Log(strings.Repeat("+", maxLineLength+8))
652673
l.Log("\n")
653674
}

‎testutil/network/util.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ func startInProcess(cfg Config, val *Validator) error {
114114
}
115115
}
116116
}
117+
117118
return nil
118119
}
119120

@@ -132,6 +133,7 @@ func collectGenFiles(cfg Config, vals []*Validator, outputDir string) error {
132133
initCfg := genutiltypes.NewInitConfig(cfg.ChainID, gentxsDir, vals[i].NodeID, vals[i].PubKey)
133134

134135
genFile := tmCfg.GenesisFile()
136+
135137
genDoc, err := types.GenesisDocFromFile(genFile)
136138
if err != nil {
137139
return err
@@ -155,6 +157,7 @@ func collectGenFiles(cfg Config, vals []*Validator, outputDir string) error {
155157
func initGenFiles(cfg Config, genAccounts []authtypes.GenesisAccount, genBalances []banktypes.Balance, genFiles []string) error {
156158
// set the accounts in the genesis state
157159
var authGenState authtypes.GenesisState
160+
158161
cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[authtypes.ModuleName], &authGenState)
159162

160163
accounts, err := authtypes.PackAccounts(genAccounts)
@@ -167,6 +170,7 @@ func initGenFiles(cfg Config, genAccounts []authtypes.GenesisAccount, genBalance
167170

168171
// set the balances in the genesis state
169172
var bankGenState banktypes.GenesisState
173+
170174
cfg.Codec.MustUnmarshalJSON(cfg.GenesisState[banktypes.ModuleName], &bankGenState)
171175

172176
bankGenState.Balances = append(bankGenState.Balances, genBalances...)
@@ -202,7 +206,7 @@ func writeFile(name string, dir string, contents []byte) error {
202206
return err
203207
}
204208

205-
err = os.WriteFile(file, contents, 0o644) // nolint: gosec
209+
err = os.WriteFile(file, contents, 0o644) //nolint: gosec
206210
if err != nil {
207211
return err
208212
}

‎x/lsnative/distribution/client/testutil/withdraw_all_suite.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"github.com/cosmos/cosmos-sdk/crypto/hd"
99
"github.com/cosmos/cosmos-sdk/crypto/keyring"
1010
clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli"
11-
"github.com/persistenceOne/persistence-sdk/v2/testutil/network"
1211
sdk "github.com/cosmos/cosmos-sdk/types"
1312
banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil"
13+
"github.com/persistenceOne/persistence-sdk/v2/testutil/network"
1414
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/client/cli"
1515
stakingcli "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/client/cli"
1616
"github.com/stretchr/testify/suite"

‎x/lsnative/distribution/simulation/proposals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package simulation
33
import (
44
"math/rand"
55

6-
simappparams "github.com/persistenceOne/persistence-sdk/v2/simapp/params"
76
sdk "github.com/cosmos/cosmos-sdk/types"
87
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
98
"github.com/cosmos/cosmos-sdk/x/simulation"
9+
simappparams "github.com/persistenceOne/persistence-sdk/v2/simapp/params"
1010
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/keeper"
1111
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/distribution/types"
1212
)

‎x/lsnative/distribution/types/distribution.pb.go

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎x/lsnative/genutil/types/genesis_state_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
1212
sdk "github.com/cosmos/cosmos-sdk/types"
1313
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
14-
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
1514
"github.com/persistenceOne/persistence-sdk/v2/simapp"
15+
"github.com/persistenceOne/persistence-sdk/v2/x/lsnative/genutil/types"
1616
stakingtypes "github.com/persistenceOne/persistence-sdk/v2/x/lsnative/staking/types"
1717
)
1818

‎x/lsnative/proto/lsnative/distribution/v1beta1/distribution.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ message Params {
3636
// The reference count indicates the number of objects
3737
// which might need to reference this historical entry at any point.
3838
// ReferenceCount =
39+
//
3940
// number of outstanding delegations which ended the associated period (and
4041
// might need to read that record)
4142
// + number of slashes which ended the associated period (and might need to

0 commit comments

Comments
 (0)