fix lint issues

bnb-chain · Aug 9, 2023 · 1946302 · 1946302
1 parent 8f22e46
commit 1946302
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 21 deletions.
diff --git a/e2e/tests/storage_test.go b/e2e/tests/storage_test.go
@@ -302,7 +302,8 @@ func (s *StorageTestSuite) TestCreateGroup() {
 
 	// 4. UpdateGroupMember(add)
 	membersToAdd := []*storagetypes.MsgGroupMember{
-		{Member: member.GetAddr().String(), ExpirationTime: storagetypes.MaxTimeStamp}}
+		{Member: member.GetAddr().String()},
+	}
 	membersToDelete := []sdk.AccAddress{}
 	msgUpdateGroupMember := storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), owner.GetAddr(), groupName, membersToAdd, membersToDelete)
 	s.SendTxBlock(owner, msgUpdateGroupMember)
@@ -320,7 +321,8 @@ func (s *StorageTestSuite) TestCreateGroup() {
 	// 5. UpdateGroupMember(delete)
 	member2 := s.GenAndChargeAccounts(1, 1000000)[0]
 	membersToAdd = []*storagetypes.MsgGroupMember{
-		{Member: member2.GetAddr().String(), ExpirationTime: storagetypes.MaxTimeStamp}}
+		{Member: member2.GetAddr().String()},
+	}
 	membersToDelete = []sdk.AccAddress{member.GetAddr()}
 	msgUpdateGroupMember = storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), owner.GetAddr(), groupName, membersToAdd, membersToDelete)
 	s.SendTxBlock(owner, msgUpdateGroupMember)
@@ -351,7 +353,8 @@ func (s *StorageTestSuite) TestLeaveGroup() {
 	s.SendTxBlock(owner, msgCreateGroup)
 	s.T().Logf("CerateGroup success, owner: %s, group name: %s", owner.GetAddr().String(), groupName)
 	membersToAdd := []*storagetypes.MsgGroupMember{
-		{Member: member.GetAddr().String(), ExpirationTime: storagetypes.MaxTimeStamp}}
+		{Member: member.GetAddr().String()},
+	}
 	membersToDelete := []sdk.AccAddress{}
 	msgUpdateGroupMember := storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), owner.GetAddr(), groupName, membersToAdd, membersToDelete)
 	s.SendTxBlock(owner, msgUpdateGroupMember)
@@ -389,7 +392,8 @@ func (s *StorageTestSuite) TestLeaveGroup() {
 	// 4. UpdateGroupMember
 	member2 := s.GenAndChargeAccounts(1, 1000000)[0]
 	membersToAdd = []*storagetypes.MsgGroupMember{
-		{Member: member2.GetAddr().String(), ExpirationTime: storagetypes.MaxTimeStamp}}
+		{Member: member2.GetAddr().String()},
+	}
 	membersToDelete = []sdk.AccAddress{member.GetAddr()}
 	msgUpdateGroupMember = storagetypes.NewMsgUpdateGroupMember(owner.GetAddr(), owner.GetAddr(), groupName, membersToAdd, membersToDelete)
 	s.SendTxBlock(owner, msgUpdateGroupMember)
@@ -1561,7 +1565,8 @@ func (s *StorageTestSuite) TestCreateAndRenewGroup() {
 	expiration, err := time.Parse(time.RFC3339, "2022-12-31T23:59:59Z")
 	s.Require().NoError(err)
 	members := []*storagetypes.MsgGroupMember{
-		{Member: member.GetAddr().String(), ExpirationTime: expiration}}
+		{Member: member.GetAddr().String()},
+	}
 	msgUpdateGroupMember := storagetypes.NewMsgRenewGroupMember(owner.GetAddr(), owner.GetAddr(), testGroupName, members)
 	s.SendTxBlock(owner, msgUpdateGroupMember)
 

diff --git a/x/permission/types/keys.go b/x/permission/types/keys.go
@@ -2,13 +2,13 @@ package types
 
 import (
 	"fmt"
+	"math/big"
 	"time"
 
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/bnb-chain/greenfield/types/resource"
-	"math/big"
 )
 
 const (

diff --git a/x/storage/types/message_test.go b/x/storage/types/message_test.go
@@ -249,13 +249,12 @@ func TestMsgUpdateGroupMember_ValidateBasic(t *testing.T) {
 				Operator:   sample.RandAccAddressHex(),
 				GroupOwner: sample.RandAccAddressHex(),
 				GroupName:  testGroupName,
-				MembersToAdd: []*MsgGroupMember{{
-					Member:         sample.RandAccAddressHex(),
-					ExpirationTime: MaxTimeStamp,
-				},
+				MembersToAdd: []*MsgGroupMember{
+					{
+						Member: sample.RandAccAddressHex(),
+					},
 					{
-						Member:         sample.RandAccAddressHex(),
-						ExpirationTime: MaxTimeStamp,
+						Member: sample.RandAccAddressHex(),
 					},
 				},
 				MembersToDelete: []string{sample.RandAccAddressHex(), sample.RandAccAddressHex()},
@@ -275,7 +274,6 @@ func TestMsgUpdateGroupMember_ValidateBasic(t *testing.T) {
 }
 
 func TestMsgUpdateGroupExtra_ValidateBasic(t *testing.T) {
-
 	tests := []struct {
 		name string
 		msg  MsgUpdateGroupExtra
@@ -325,8 +323,10 @@ func TestMsgPutPolicy_ValidateBasic(t *testing.T) {
 				Operator:  sample.RandAccAddressHex(),
 				Resource:  types2.NewBucketGRN(testBucketName).String(),
 				Principal: types.NewPrincipalWithAccount(sdk.MustAccAddressFromHex(sample.RandAccAddressHex())),
-				Statements: []*types.Statement{{Effect: types.EFFECT_ALLOW,
-					Actions: []types.ActionType{types.ACTION_DELETE_BUCKET}}},
+				Statements: []*types.Statement{{
+					Effect:  types.EFFECT_ALLOW,
+					Actions: []types.ActionType{types.ACTION_DELETE_BUCKET},
+				}},
 			},
 		},
 	}
@@ -448,13 +448,12 @@ func TestMsgRenewGroupMember_ValidateBasic(t *testing.T) {
 				Operator:   sample.RandAccAddressHex(),
 				GroupOwner: sample.RandAccAddressHex(),
 				GroupName:  testGroupName,
-				Members: []*MsgGroupMember{{
-					Member:         sample.RandAccAddressHex(),
-					ExpirationTime: MaxTimeStamp,
-				},
+				Members: []*MsgGroupMember{
+					{
+						Member: sample.RandAccAddressHex(),
+					},
 					{
-						Member:         sample.RandAccAddressHex(),
-						ExpirationTime: MaxTimeStamp,
+						Member: sample.RandAccAddressHex(),
 					},
 				},
 			},