chore: run make format (#5103)

* this pr only runs make format * run make format * correct comment for PoolsKey * restore grpc_query.go to same style as found in main * correct changelog formatting --------- Co-authored-by: Ruslan Akhtariev <[email protected]>
osmosis-labs · May 8, 2023 · 7cc0090 · 7cc0090
1 parent 1afdd6a
commit 7cc0090
Show file tree

Hide file tree

Showing 89 changed files with 213 additions and 236 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Misc Improvements
 
+  * [#5103](https://github.com/osmosis-labs/osmosis/pull/5103) Run `make format`
   * [#5105](https://github.com/osmosis-labs/osmosis/pull/5105) Lint stableswap in the same manner as all of Osmosis
   * [#5065](https://github.com/osmosis-labs/osmosis/pull/5065) Use cosmossdk.io/errors
   * [#4549](https://github.com/osmosis-labs/osmosis/pull/4549) Add single pool price estimate queries

diff --git a/app/upgrades/v13/upgrade_test.go b/app/upgrades/v13/upgrade_test.go
@@ -2,9 +2,10 @@ package v13_test
 
 import (
 	"fmt"
-	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
 	"testing"
 
+	ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types"
+
 	ibcratelimittypes "github.com/osmosis-labs/osmosis/v15/x/ibc-rate-limit/types"
 
 	"github.com/cosmos/cosmos-sdk/store/prefix"
@@ -55,8 +56,8 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 			"Test that the upgrade succeeds",
 			func() {
 				// The module doesn't need an account anymore, but when the upgrade happened we did:
-				//acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.App.AccountKeeper.RemoveAccount(suite.Ctx, acc)
+				// acc := suite.App.AccountKeeper.GetAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.App.AccountKeeper.RemoveAccount(suite.Ctx, acc)
 
 				// Because of SDK version map bug, we can't do the following, and instaed do a massive hack
 				// vm := suite.App.UpgradeKeeper.GetModuleVersionMap(suite.Ctx)
@@ -70,15 +71,15 @@ func (suite *UpgradeTestSuite) TestUpgrade() {
 				versionStore.Delete([]byte(ibchookstypes.ModuleName))
 
 				// Same comment as above: this was the case when the upgrade happened, but we don't have accounts anymore
-				//hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.Require().False(hasAcc)
+				// hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.Require().False(hasAcc)
 
 			},
 			func() { dummyUpgrade(suite) },
 			func() {
 				// Same comment as pre-upgrade. We had an account, but now we don't anymore
-				//hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
-				//suite.Require().True(hasAcc)
+				// hasAcc := suite.App.AccountKeeper.HasAccount(suite.Ctx, ibc_hooks.WasmHookModuleAccountAddr)
+				// suite.Require().True(hasAcc)
 			},
 		},
 		{

diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go
@@ -15,9 +15,11 @@ import (
 const UpgradeName = "v15"
 
 // pool ids to migrate
-const stOSMO_OSMOPoolId = 833
-const stJUNO_JUNOPoolId = 817
-const stSTARS_STARSPoolId = 810
+const (
+	stOSMO_OSMOPoolId   = 833
+	stJUNO_JUNOPoolId   = 817
+	stSTARS_STARSPoolId = 810
+)
 
 var Upgrade = upgrades.Upgrade{
 	UpgradeName:          UpgradeName,

diff --git a/app/upgrades/v15/upgrade_test.go b/app/upgrades/v15/upgrade_test.go
@@ -50,9 +50,7 @@ func (suite *UpgradeTestSuite) TestMigrateNextPoolIdAndCreatePool() {
 		expectedNextPoolId uint64 = 1
 	)
 
-	var (
-		gammKeeperType = reflect.TypeOf(&gamm.Keeper{})
-	)
+	gammKeeperType := reflect.TypeOf(&gamm.Keeper{})
 
 	ctx := suite.Ctx
 	gammKeeper := suite.App.GAMMKeeper
@@ -249,7 +247,6 @@ func (suite *UpgradeTestSuite) TestSetRateLimits() {
 	// This is the last one. If the others failed the upgrade would've panicked before adding this one
 	state, err = suite.App.WasmKeeper.QuerySmart(suite.Ctx, addr, []byte(`{"get_quotas": {"channel_id": "any", "denom": "ibc/E6931F78057F7CC5DA0FD6CEF82FF39373A6E0452BF1FD76910B93292CF356C1"}}`))
 	suite.Require().Greaterf(len(state), 0, "state should not be empty")
-
 }
 
 func (suite *UpgradeTestSuite) validateCons(coinsA, coinsB sdk.Coins) {

diff --git a/tests/cl-genesis-positions/convert.go b/tests/cl-genesis-positions/convert.go
@@ -45,9 +45,7 @@ type OsmosisApp struct {
 	TestAccs    []sdk.AccAddress
 }
 
-var (
-	osmosisPrecision = 6
-)
+var osmosisPrecision = 6
 
 func ReadSubgraphDataFromDisk(subgraphFilePath string) []SubgraphPosition {
 	// read in the data from file
@@ -193,7 +191,6 @@ func ConvertSubgraphToOsmosisGenesis(positionCreatorAddresses []sdk.AccAddress,
 			TokenMinAmount0: sdk.ZeroInt(),
 			TokenMinAmount1: sdk.ZeroInt(),
 		})
-
 		if err != nil {
 			fmt.Printf("\n\n\nWARNING: Failed to create position: %v\n\n\n", err)
 			fmt.Printf("attempted creation between ticks (%s) and (%s), desired amount 0: (%s), desired amount 1 (%s)\n", lowerTickOsmosis, upperTickOsmosis, depositedAmount0, depositedAmount1)
@@ -273,7 +270,7 @@ func writeStateToDisk(state map[string]json.RawMessage) {
 		panic(err)
 	}
 
-	err = os.WriteFile(pathToFilesFromRoot+osmosisGenesisFileName, stateBz, 0644)
+	err = os.WriteFile(pathToFilesFromRoot+osmosisGenesisFileName, stateBz, 0o644)
 	if err != nil {
 		panic(err)
 	}
@@ -287,7 +284,7 @@ func writeBigBangPositionsToState(positions []BigBangPosition) {
 	if err != nil {
 		panic(err)
 	}
-	err = os.WriteFile(pathToFilesFromRoot+bigbangPosiionsFileName, positionsBytes, 0644)
+	err = os.WriteFile(pathToFilesFromRoot+bigbangPosiionsFileName, positionsBytes, 0o644)
 	if err != nil {
 		panic(err)
 	}

diff --git a/tests/cl-genesis-positions/get_data.go b/tests/cl-genesis-positions/get_data.go
@@ -96,7 +96,7 @@ func GetUniV3SubgraphData(pathToSaveAt string) {
 		return
 	}
 
-	if err := os.WriteFile(pathToSaveAt, jsonData, 0644); err != nil {
+	if err := os.WriteFile(pathToSaveAt, jsonData, 0o644); err != nil {
 		fmt.Println("Error writing JSON file:", err)
 		return
 	}

diff --git a/tests/cl-genesis-positions/local_accounts.go b/tests/cl-genesis-positions/local_accounts.go
@@ -1,15 +1,14 @@
 package main
 
 import (
+	"context"
+	"fmt"
+	"log"
 	"os/user"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/ignite/cli/ignite/pkg/cosmosaccount"
 	"github.com/ignite/cli/ignite/pkg/cosmosclient"
-
-	"context"
-	"fmt"
-	"log"
 )
 
 const (

diff --git a/tests/cl-go-client/main.go b/tests/cl-go-client/main.go
@@ -159,7 +159,6 @@ func createPosition(client cosmosclient.Client, poolId uint64, senderKeyringAcco
 		TokenMinAmount1: tokenMinAmount1,
 	}
 	txResp, err := client.BroadcastTx(senderKeyringAccountName, msg)
-
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go
@@ -281,6 +281,7 @@ func (n *NodeConfig) QueryConcentratedPositions(address string) []model.Position
 	require.NoError(n.t, err)
 	return positionsResponse.Positions
 }
+
 func (n *NodeConfig) QueryConcentratedPool(poolId uint64) (cltypes.ConcentratedPoolExtension, error) {
 	path := fmt.Sprintf("/osmosis/poolmanager/v1beta1/pools/%d", poolId)
 	bz, err := n.QueryGRPCGateway(path)

diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -660,10 +660,8 @@ func (s *IntegrationTestSuite) TestConcentratedLiquidity() {
 
 	// Withdraw Position
 
-	var (
-		// Withdraw Position parameters
-		defaultLiquidityRemoval string = "1000"
-	)
+	// Withdraw Position parameters
+	var defaultLiquidityRemoval string = "1000"
 
 	chainA.WaitForNumHeights(2)
 
@@ -977,7 +975,7 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 
 	// Removing the rate limit so it doesn't affect other tests
 	node.WasmExecute(contract, `{"remove_path": {"channel_id": "channel-0", "denom": "uosmo"}}`, initialization.ValidatorWalletName)
-	//reset the param to the original contract if it existed
+	// reset the param to the original contract if it existed
 	if param != "" {
 		err = chainA.SubmitParamChangeProposal(
 			ibcratelimittypes.ModuleName,
@@ -991,7 +989,6 @@ func (s *IntegrationTestSuite) TestIBCTokenTransferRateLimiting() {
 		}, time.Second*30, time.Millisecond*500)
 
 	}
-
 }
 
 func (s *IntegrationTestSuite) TestLargeWasmUpload() {
@@ -1161,7 +1158,6 @@ func (s *IntegrationTestSuite) TestAddToExistingLock() {
 // because twap keep time = epoch time / 4 and we use a timer
 // to wait for at least the twap keep time.
 func (s *IntegrationTestSuite) TestArithmeticTWAP() {
-
 	s.T().Skip("TODO: investigate further: https://github.com/osmosis-labs/osmosis/issues/4342")
 
 	const (
@@ -1559,10 +1555,8 @@ func (s *IntegrationTestSuite) TestAConcentratedLiquidity_CanonicalPool_And_Para
 		s.T().Skip("Skipping v16 canonical pool creation test because upgrade is not enabled")
 	}
 
-	var (
-		// Taken from: https://app.osmosis.zone/pool/674
-		expectedFee = sdk.MustNewDecFromStr("0.002")
-	)
+	// Taken from: https://app.osmosis.zone/pool/674
+	expectedFee := sdk.MustNewDecFromStr("0.002")
 
 	chainA := s.configurer.GetChainConfig(0)
 	chainANode, err := chainA.GetDefaultNode()

diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go
@@ -477,7 +477,7 @@ func updateTWAPGenesis(appGenState map[string]json.RawMessage) func(twapGenState
 					Asset0Denom:                 denomPair.Denom0,
 					Asset1Denom:                 denomPair.Denom0,
 					Height:                      1,
-					Time:                        time.Date(2023, 02, 1, 0, 0, 0, 0, time.UTC), // some time in the past.
+					Time:                        time.Date(2023, 0o2, 1, 0, 0, 0, 0, time.UTC), // some time in the past.
 					P0LastSpotPrice:             sp0,
 					P1LastSpotPrice:             sp1,
 					P0ArithmeticTwapAccumulator: sdk.ZeroDec(),

diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go
@@ -3,11 +3,12 @@ package ibc_hooks_test
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tidwall/gjson"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/tidwall/gjson"
+
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 
 	ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper"
@@ -608,7 +609,6 @@ func (suite *HooksTestSuite) TestAcks() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":2}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestTimeouts() {
@@ -641,7 +641,6 @@ func (suite *HooksTestSuite) TestTimeouts() {
 		&suite.Suite, addr,
 		[]byte(fmt.Sprintf(`{"get_count": {"addr": "%s"}}`, addr)))
 	suite.Require().Equal(`{"count":10}`, state)
-
 }
 
 func (suite *HooksTestSuite) TestSendWithoutMemo() {
@@ -1200,7 +1199,6 @@ func (suite *HooksTestSuite) TestCrosschainSwapsViaIBCBadAck() {
 	// Calling recovery again should fail
 	_, err = contractKeeper.Execute(suite.chainA.GetContext(), crosschainAddr, recoverAddr2, []byte(recoverMsg), sdk.NewCoins())
 	suite.Require().Error(err)
-
 }
 
 // CrosschainSwapsViaIBCBadSwap tests that if the crosschain-swap fails, the tokens are returned to the sender
@@ -1363,7 +1361,6 @@ func (suite *HooksTestSuite) SetupIBCRouteOnChain(swaprouterAddr, owner sdk.AccA
 	suite.Require().NoError(err)
 	err = suite.pathAB.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-
 }
 
 func (suite *HooksTestSuite) SetupIBCSimpleRouteOnChain(swaprouterAddr, owner sdk.AccAddress, poolId uint64, chainName Chain, denom1, denom2 string) {
@@ -1390,7 +1387,6 @@ func (suite *HooksTestSuite) SetupIBCSimpleRouteOnChain(swaprouterAddr, owner sd
 	suite.Require().NoError(err)
 	err = suite.pathAB.EndpointB.UpdateClient()
 	suite.Require().NoError(err)
-
 }
 
 // TestCrosschainForwardWithMemo tests the that the next_memo field is correctly forwarded to the other chain on the IBC transfer.
@@ -1418,7 +1414,7 @@ func (suite *HooksTestSuite) TestCrosschainForwardWithMemo() {
 	fmt.Println("receiver now has: ", balanceToken0IBCBefore)
 	suite.Require().Equal(int64(0), balanceToken0IBCBefore.Amount.Int64())
 
-	//suite.Require().Equal(int64(0), balanceToken1.Amount.Int64())
+	// suite.Require().Equal(int64(0), balanceToken1.Amount.Int64())
 
 	// Generate swap instructions for the contract
 	//
@@ -1788,9 +1784,7 @@ func (suite *HooksTestSuite) TestMultiHopXCS() {
 
 			receivedTokenAfter := receiverChain.GetOsmosisApp().BankKeeper.GetBalance(receiverChain.GetContext(), tc.receiver.address, tc.receivedToken)
 			suite.Require().True(receivedTokenAfter.Amount.GT(receivedTokenBalance.Amount))
-
 		})
-
 	}
 }
 
@@ -1853,7 +1847,7 @@ func (suite *HooksTestSuite) ExecuteOutpostSwap(initializer, receiverAddr sdk.Ac
 
 	// But the receiver now has some token1IBC
 	balanceToken1After := osmosisAppB.BankKeeper.GetBalance(suite.chainB.GetContext(), receiverAddr, token1IBC)
-	//fmt.Println("receiver now has: ", balanceToken1After)
+	// fmt.Println("receiver now has: ", balanceToken1After)
 	suite.Require().Greater(balanceToken1After.Amount.Int64(), int64(0))
 }
 

diff --git a/tests/ibc-hooks/xcs_cw20_test.go b/tests/ibc-hooks/xcs_cw20_test.go
@@ -4,6 +4,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	transfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
@@ -175,5 +176,4 @@ func (suite *HooksTestSuite) TestCW20ICS20() {
 	// Check that the receiver has more cw20 tokens than before
 	newCw20Balance := suite.getCW20Balance(chainB, cw20Addr, receiver2)
 	suite.Require().Greater(newCw20Balance.Int64(), cw20Balance.Int64())
-
 }
diff --git a/x/concentrated-liquidity/client/cli/query.go b/x/concentrated-liquidity/client/cli/query.go
@@ -30,7 +30,8 @@ func GetUserPositions() (*osmocli.QueryDescriptor, *queryproto.UserPositionsRequ
 			Long: `{{.Short}}{{.ExampleHeader}}
 {{.CommandPrefix}} user-positions osmo12smx2wdlyttvyzvzg54y2vnqwq2qjateuf7thj`,
 			Flags:               osmocli.FlagDesc{OptionalFlags: []*flag.FlagSet{FlagSetJustPoolId()}},
-			CustomFlagOverrides: poolIdFlagOverride},
+			CustomFlagOverrides: poolIdFlagOverride,
+		},
 		&queryproto.UserPositionsRequest{}
 }
 
@@ -39,21 +40,24 @@ func GetCmdPools() (*osmocli.QueryDescriptor, *queryproto.PoolsRequest) {
 		Use:   "pools",
 		Short: "Query pools",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} pools`}, &queryproto.PoolsRequest{}
+{{.CommandPrefix}} pools`,
+	}, &queryproto.PoolsRequest{}
 }
 
 func GetClaimableFees() (*osmocli.QueryDescriptor, *queryproto.ClaimableFeesRequest) {
 	return &osmocli.QueryDescriptor{
 		Use:   "claimable-fees [positionID]",
 		Short: "Query claimable fees",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} claimable-fees 53`}, &queryproto.ClaimableFeesRequest{}
+{{.CommandPrefix}} claimable-fees 53`,
+	}, &queryproto.ClaimableFeesRequest{}
 }
 
 func GetClaimableIncentives() (*osmocli.QueryDescriptor, *queryproto.ClaimableIncentivesRequest) {
 	return &osmocli.QueryDescriptor{
 		Use:   "claimable-incentives [positionID]",
 		Short: "Query claimable incentives",
 		Long: `{{.Short}}{{.ExampleHeader}}
-{{.CommandPrefix}} claimable-fees 53`}, &queryproto.ClaimableIncentivesRequest{}
+{{.CommandPrefix}} claimable-fees 53`,
+	}, &queryproto.ClaimableIncentivesRequest{}
 }
diff --git a/x/concentrated-liquidity/client/cli/tx.go b/x/concentrated-liquidity/client/cli/tx.go
@@ -237,6 +237,7 @@ func parseCreateConcentratedLiquidityPoolArgsToContent(cmd *cobra.Command, denom
 
 	return content, nil
 }
+
 func parsePoolIdToTickSpacingRecordsArgsToContent(cmd *cobra.Command) (govtypes.Content, error) {
 	title, err := cmd.Flags().GetString(govcli.FlagTitle)
 	if err != nil {

diff --git a/x/concentrated-liquidity/keeper_test.go b/x/concentrated-liquidity/keeper_test.go
@@ -291,7 +291,8 @@ func (s *KeeperTestSuite) validateListenerCallCount(
 	expectedPoolCreatedListenerCallCount,
 	expectedInitialPositionCreationListenerCallCount,
 	expectedLastPositionWithdrawalListenerCallCount,
-	expectedSwapListenerCallCount int) {
+	expectedSwapListenerCallCount int,
+) {
 	// Validate that listeners were called the desired number of times
 	listeners := s.App.ConcentratedLiquidityKeeper.GetListenersUnsafe()
 	s.Require().Len(listeners, 1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ func GetUniV3SubgraphData(pathToSaveAt string) { @@
     		return
     	}
-    	if err := os.WriteFile(pathToSaveAt, jsonData, 0644); err != nil {
+    	if err := os.WriteFile(pathToSaveAt, jsonData, 0o644); err != nil {
     		fmt.Println("Error writing JSON file:", err)
     		return
     	}
@@ Expand Down @@