Merge branch 'master' into api-routing

JackalLabs · Jun 18, 2023 · 705dda1 · 705dda1
2 parents 268c2b4 + b921261
commit 705dda1
Show file tree

Hide file tree

Showing 28 changed files with 39 additions and 48 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -26,7 +26,6 @@ linters:
     - unconvert
     - unused
     - unparam
-    - misspell
 
 linters-settings:
   gosec:

diff --git a/app/sim_test.go b/app/sim_test.go
@@ -162,9 +162,13 @@ func TestAppImportExport(t *testing.T) {
 
 	t.Log("importing genesis...")
 
-	_, newDB, newDir, _, _, err := SetupSimulation("leveldb-app-sim-2", "Simulation-2")
+	simConfig, newDB, newDir, simLogger, simFlag, err := SetupSimulation("leveldb-app-sim-2", "Simulation-2")
 	require.NoError(t, err, "simulation setup failed")
 
+	_ = simConfig
+	_ = simLogger
+	_ = simFlag
+
 	defer func() {
 		newDB.Close()
 		require.NoError(t, os.RemoveAll(newDir))

diff --git a/x/filetree/client/cli/tx_post_file.go b/x/filetree/client/cli/tx_post_file.go
@@ -34,10 +34,7 @@ func CmdPostFile() *cobra.Command {
 				return err
 			}
 
-			fromAddress, err := getCallerAddress(clientCtx, cmd)
-			if err != nil {
-				return err
-			}
+			fromAddress := getCallerAddress(clientCtx)
 
 			if argKeys == "" {
 				return filetypes.ErrMissingAESKey

diff --git a/x/filetree/client/cli/utils.go b/x/filetree/client/cli/utils.go
@@ -83,10 +83,9 @@ func encryptFileAESKey(cmd *cobra.Command, key string, argKeys string) ([]byte,
 	return encrypted, nil
 }
 
-func getCallerAddress(ctx client.Context, cmd *cobra.Command) (*string, error) {
-	_ = cmd
+func getCallerAddress(ctx client.Context) *string {
 	fromAddress := ctx.GetFromAddress().String()
-	return &fromAddress, nil
+	return &fromAddress
 }
 
 func JSONMarshalViewersAndEditors(viewers map[string]string, editors map[string]string) ([]byte, []byte, error) {

diff --git a/x/filetree/keeper/keeper_test.go b/x/filetree/keeper/keeper_test.go
@@ -41,11 +41,11 @@ func (suite *KeeperTestSuite) reset() {
 	suite.msgSrvr = keeper.NewMsgServerImpl(*suite.filetreeKeeper)
 }
 
-func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, keeper.Keeper, gocontext.Context) {
+func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, gocontext.Context) {
 	k := suite.filetreeKeeper
 	filetree.InitGenesis(suite.ctx, *k, *types.DefaultGenesis())
 	ctx := sdk.WrapSDKContext(suite.ctx)
-	return keeper.NewMsgServerImpl(*k), *k, ctx
+	return keeper.NewMsgServerImpl(*k), ctx
 }
 
 func TestFiletreeTestSuite(t *testing.T) {

diff --git a/x/filetree/keeper/marshalling_test.go b/x/filetree/keeper/marshalling_test.go
@@ -13,7 +13,7 @@ import (
 
 func (suite *KeeperTestSuite) TestJSONMarshalling() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_add_editors_test.go b/x/filetree/keeper/msg_server_add_editors_test.go
@@ -11,7 +11,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgAddEditors() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_add_viewers_test.go b/x/filetree/keeper/msg_server_add_viewers_test.go
@@ -20,7 +20,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgAddViewers() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_change_owner_test.go b/x/filetree/keeper/msg_server_change_owner_test.go
@@ -10,7 +10,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgChangeOwners() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_delete_file_test.go b/x/filetree/keeper/msg_server_delete_file_test.go
@@ -10,7 +10,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgDeleteFile() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_make_root_test.go b/x/filetree/keeper/msg_server_make_root_test.go
@@ -7,7 +7,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgMakeRoot() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_post_file_test.go b/x/filetree/keeper/msg_server_post_file_test.go
@@ -10,7 +10,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgPostFile() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_post_key_test.go b/x/filetree/keeper/msg_server_post_key_test.go
@@ -10,7 +10,7 @@ import (
 func (suite *KeeperTestSuite) TestMsgPostKey() {
 	suite.SetupSuite()
 
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_remove_editors_test.go b/x/filetree/keeper/msg_server_remove_editors_test.go
@@ -11,7 +11,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgRemoveEditors() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_remove_viewers_test.go b/x/filetree/keeper/msg_server_remove_viewers_test.go
@@ -12,7 +12,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgRemoveViewers() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_reset_editors_test.go b/x/filetree/keeper/msg_server_reset_editors_test.go
@@ -11,7 +11,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgResetEditors() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/filetree/keeper/msg_server_reset_viewers_test.go b/x/filetree/keeper/msg_server_reset_viewers_test.go
@@ -12,7 +12,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgResetViewers() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/notifications/keeper/keeper_test.go b/x/notifications/keeper/keeper_test.go
@@ -41,11 +41,11 @@ func (suite *KeeperTestSuite) reset() {
 	suite.msgSrvr = keeper.NewMsgServerImpl(*suite.notificationsKeeper)
 }
 
-func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, keeper.Keeper, gocontext.Context) {
+func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, gocontext.Context) {
 	k := suite.notificationsKeeper
 	notifications.InitGenesis(suite.ctx, *k, *types.DefaultGenesis())
 	ctx := sdk.WrapSDKContext(suite.ctx)
-	return keeper.NewMsgServerImpl(*k), *k, ctx
+	return keeper.NewMsgServerImpl(*k), ctx
 }
 
 func TestNotificationsTestSuite(t *testing.T) {

diff --git a/x/notifications/keeper/msg_server_block_senders_test.go b/x/notifications/keeper/msg_server_block_senders_test.go
@@ -9,7 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgBlockSenders() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/notifications/keeper/msg_server_create_notifications_test.go b/x/notifications/keeper/msg_server_create_notifications_test.go
@@ -9,7 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgCreateNotifications() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 3)
 	suite.Require().NoError(err)

diff --git a/x/notifications/keeper/msg_server_delete_notifications_test.go b/x/notifications/keeper/msg_server_delete_notifications_test.go
@@ -9,7 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgDeleteNotifications() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/notifications/keeper/msg_server_set_counter_test.go b/x/notifications/keeper/msg_server_set_counter_test.go
@@ -7,7 +7,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgSetCounter() {
 	suite.SetupSuite()
-	msgSrvr, _, context := setupMsgServer(suite)
+	msgSrvr, context := setupMsgServer(suite)
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)

diff --git a/x/oracle/keeper/keeper_test.go b/x/oracle/keeper/keeper_test.go
@@ -55,11 +55,11 @@ func (suite *KeeperTestSuite) reset() {
 	suite.testAccs = CreateRandomAccounts(3)
 }
 
-func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, keeper.Keeper, gocontext.Context) {
+func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, gocontext.Context) {
 	k := suite.oracleKeeper
 	oracle.InitGenesis(suite.ctx, *k, *types.DefaultGenesis())
 	ctx := sdk.WrapSDKContext(suite.ctx)
-	return keeper.NewMsgServerImpl(*k), *k, ctx
+	return keeper.NewMsgServerImpl(*k), ctx
 }
 
 func CreateRandomAccounts(numAccs int) []sdk.AccAddress {

diff --git a/x/oracle/keeper/msg_server_feeds_test.go b/x/oracle/keeper/msg_server_feeds_test.go
@@ -44,7 +44,7 @@ func (suite *KeeperTestSuite) TestCreateFeed() {
 	for name, tc := range cases {
 		suite.Run(name, func() {
 			suite.SetupSuite()
-			msgSrvr, _, _ := setupMsgServer(suite)
+			msgSrvr, _ := setupMsgServer(suite)
 			suite.oracleKeeper.SetFeed(suite.ctx, genesisFeed)
 
 			// TODO: setup simulation and use that instead
@@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) TestUpdateFeed() {
 		suite.Run(name, func() {
 			suite.reset()
 			suite.oracleKeeper.SetFeed(suite.ctx, genesisFeed)
-			msgSrvr, _, wctx := setupMsgServer(suite)
+			msgSrvr, wctx := setupMsgServer(suite)
 
 			result, err := msgSrvr.UpdateFeed(wctx, &types.MsgUpdateFeed{
 				Name:    tc.name,

diff --git a/x/rns/keeper/bidding_test.go b/x/rns/keeper/bidding_test.go
@@ -12,8 +12,7 @@ const TestName = "test.jkl"
 
 func (suite *KeeperTestSuite) TestMsgAcceptBid() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)
@@ -76,8 +75,7 @@ func (suite *KeeperTestSuite) TestMsgAcceptBid() {
 
 func (suite *KeeperTestSuite) TestMsgMakeBid() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)
@@ -115,8 +113,7 @@ func (suite *KeeperTestSuite) TestMsgMakeBid() {
 
 func (suite *KeeperTestSuite) TestMsgCancelBid() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)

diff --git a/x/rns/keeper/keeper_test.go b/x/rns/keeper/keeper_test.go
@@ -62,7 +62,7 @@ func setupMsgServer(suite *KeeperTestSuite) (types.MsgServer, keeper.Keeper, goc
 	return keeper.NewMsgServerImpl(*k), *k, ctx
 }
 
-func (suite *KeeperTestSuite) setupNames() error {
+func (suite *KeeperTestSuite) setupNames() {
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)
 
@@ -84,14 +84,11 @@ func (suite *KeeperTestSuite) setupNames() error {
 
 		suite.rnsKeeper.SetNames(suite.ctx, name)
 	}
-
-	return nil
 }
 
 func (suite *KeeperTestSuite) TestMakeBid() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)

diff --git a/x/rns/keeper/register_test.go b/x/rns/keeper/register_test.go
@@ -9,8 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgRegisterName() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 1)
 	suite.Require().NoError(err)

diff --git a/x/rns/keeper/transfer_test.go b/x/rns/keeper/transfer_test.go
@@ -9,8 +9,7 @@ import (
 
 func (suite *KeeperTestSuite) TestMsgTransfer() {
 	suite.SetupSuite()
-	err := suite.setupNames()
-	suite.Require().NoError(err)
+	suite.setupNames()
 
 	testAddresses, err := testutil.CreateTestAddresses("cosmos", 2)
 	suite.Require().NoError(err)