From 6707f346195fd2cdaf50d75bc0a1c63e2eec29ce Mon Sep 17 00:00:00 2001 From: Joe Bowman Date: Fri, 10 Mar 2023 12:59:30 +0000 Subject: [PATCH] chore: formatting --- cmd/quicksilverd/forceprune.go | 2 +- go.mod | 3 ++- go.sum | 1 + x/interchainstaking/types/delegation_test.go | 1 - x/interchainstaking/types/proposals_test.go | 3 ++- x/interchainstaking/types/validator_test.go | 3 ++- x/interchainstaking/types/zones_test.go | 1 - x/participationrewards/keeper/msg_server_test.go | 6 ++---- x/participationrewards/keeper/submodule_liquid.go | 1 + 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cmd/quicksilverd/forceprune.go b/cmd/quicksilverd/forceprune.go index 80a9d4ac9..d8193a029 100644 --- a/cmd/quicksilverd/forceprune.go +++ b/cmd/quicksilverd/forceprune.go @@ -7,12 +7,12 @@ import ( "os/exec" "strconv" + tmdb "github.com/cometbft/cometbft-db" "github.com/spf13/cobra" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/opt" "github.com/syndtr/goleveldb/leveldb/util" tmstore "github.com/tendermint/tendermint/store" - tmdb "github.com/cometbft/cometbft-db" "github.com/cosmos/cosmos-sdk/client" "github.com/tendermint/tendermint/config" diff --git a/go.mod b/go.mod index a6091377d..a2bc739f1 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.19 require ( cosmossdk.io/math v1.0.0-beta.4 github.com/CosmWasm/wasmd v0.29.2 + github.com/cometbft/cometbft-db v0.7.0 github.com/cosmos/cosmos-proto v1.0.0-alpha8 github.com/cosmos/cosmos-sdk v0.46.11 github.com/cosmos/ibc-go/v5 v5.2.0 @@ -33,7 +34,7 @@ require ( ) require ( - github.com/cometbft/cometbft-db v0.7.0 // indirect + github.com/client9/misspell v0.3.4 // indirect github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect diff --git a/go.sum b/go.sum index 3d0203f60..29e939fdf 100644 --- a/go.sum +++ b/go.sum @@ -382,6 +382,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= +github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= diff --git a/x/interchainstaking/types/delegation_test.go b/x/interchainstaking/types/delegation_test.go index 10021643f..0e340f0bf 100644 --- a/x/interchainstaking/types/delegation_test.go +++ b/x/interchainstaking/types/delegation_test.go @@ -103,7 +103,6 @@ func TestNormalizeValidatorIntentsDeterminism(t *testing.T) { } }) } - } func TestDetermineAllocationsForDelegation(t *testing.T) { diff --git a/x/interchainstaking/types/proposals_test.go b/x/interchainstaking/types/proposals_test.go index 0b6eca921..59d8eecc2 100644 --- a/x/interchainstaking/types/proposals_test.go +++ b/x/interchainstaking/types/proposals_test.go @@ -1,10 +1,11 @@ package types_test import ( - "github.com/ingenuity-build/quicksilver/x/interchainstaking/types" "strings" "testing" + "github.com/ingenuity-build/quicksilver/x/interchainstaking/types" + "github.com/stretchr/testify/require" ) diff --git a/x/interchainstaking/types/validator_test.go b/x/interchainstaking/types/validator_test.go index e3c9e4faf..e00e03a20 100644 --- a/x/interchainstaking/types/validator_test.go +++ b/x/interchainstaking/types/validator_test.go @@ -1,10 +1,11 @@ package types_test import ( + "testing" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "testing" "github.com/ingenuity-build/quicksilver/utils" "github.com/ingenuity-build/quicksilver/x/interchainstaking/types" diff --git a/x/interchainstaking/types/zones_test.go b/x/interchainstaking/types/zones_test.go index 818c4d2d4..ad7151be6 100644 --- a/x/interchainstaking/types/zones_test.go +++ b/x/interchainstaking/types/zones_test.go @@ -497,7 +497,6 @@ func TestUpdateIntentWithCoins(t *testing.T) { } } } - } func TestZone_GetBondedValidatorAddressesAsSlice(t *testing.T) { diff --git a/x/participationrewards/keeper/msg_server_test.go b/x/participationrewards/keeper/msg_server_test.go index c12e9edbd..0840f982e 100644 --- a/x/participationrewards/keeper/msg_server_test.go +++ b/x/participationrewards/keeper/msg_server_test.go @@ -10,13 +10,14 @@ import ( "github.com/tendermint/tendermint/proto/tendermint/crypto" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/ingenuity-build/quicksilver/app" osmolockup "github.com/ingenuity-build/quicksilver/osmosis-types/lockup" "github.com/ingenuity-build/quicksilver/utils" cmtypes "github.com/ingenuity-build/quicksilver/x/claimsmanager/types" "github.com/ingenuity-build/quicksilver/x/participationrewards/keeper" "github.com/ingenuity-build/quicksilver/x/participationrewards/types" - abci "github.com/tendermint/tendermint/abci/types" ) func (suite *KeeperTestSuite) Test_msgServer_SubmitClaim() { @@ -283,7 +284,6 @@ func (suite *KeeperTestSuite) Test_msgServer_SubmitLocalClaim() { "local_callback_nil", func(ctx sdk.Context, appA *app.Quicksilver) {}, func(ctx sdk.Context, appA *app.Quicksilver) *types.MsgSubmitClaim { - address := utils.GenerateAccAddressForTest() key := banktypes.CreatePrefixedAccountStoreKey(address, []byte("ibc/3020922B7576FC75BBE057A0290A9AEEFF489BB1113E6E365CE472D4BFB7FFA3")) @@ -323,7 +323,6 @@ func (suite *KeeperTestSuite) Test_msgServer_SubmitLocalClaim() { suite.Require().NoError(appA.BankKeeper.SendCoinsFromModuleToAccount(ctx, "mint", address, sdk.NewCoins(sdk.NewCoin("uqatom", sdk.NewInt(100))))) }, func(ctx sdk.Context, appA *app.Quicksilver) *types.MsgSubmitClaim { - key := banktypes.CreatePrefixedAccountStoreKey(address, []byte("uqatom")) query := abci.RequestQuery{ @@ -374,7 +373,6 @@ func (suite *KeeperTestSuite) Test_msgServer_SubmitLocalClaim() { appA.ParticipationRewardsKeeper.SetProtocolData(ctx, fmt.Sprintf("%s/uqatom", suite.chainA.ChainID), pd) }, func(ctx sdk.Context, appA *app.Quicksilver) *types.MsgSubmitClaim { - key := banktypes.CreatePrefixedAccountStoreKey(address, []byte("uqatom")) query := abci.RequestQuery{ diff --git a/x/participationrewards/keeper/submodule_liquid.go b/x/participationrewards/keeper/submodule_liquid.go index 494746277..cf13f34da 100644 --- a/x/participationrewards/keeper/submodule_liquid.go +++ b/x/participationrewards/keeper/submodule_liquid.go @@ -7,6 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/bech32" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + "github.com/ingenuity-build/quicksilver/utils" "github.com/ingenuity-build/quicksilver/x/participationrewards/types" )