refactor(sample): remove pointers (#281)

lumtis · web-flow · commit eb066f7c515f · 2021-08-31T09:08:24.000+02:00
* Update sample

* update tests

* lint
diff --git a/testutil/sample/launch.go b/testutil/sample/launch.go
@@ -17,8 +17,8 @@ func GenesisChainID() string {
 }
 
 // Chain returns a sample Chain
-func Chain(id uint64, coordinatorID uint64) *launch.Chain {
-	return &launch.Chain{
+func Chain(id uint64, coordinatorID uint64) launch.Chain {
+	return launch.Chain{
 		Id:              id,
 		CoordinatorID:   coordinatorID,
 		GenesisChainID:  GenesisChainID(),
@@ -31,8 +31,8 @@ func Chain(id uint64, coordinatorID uint64) *launch.Chain {
 }
 
 // GenesisAccount returns a sample GenesisAccount
-func GenesisAccount(chainID uint64, address string) *launch.GenesisAccount {
-	return &launch.GenesisAccount{
+func GenesisAccount(chainID uint64, address string) launch.GenesisAccount {
+	return launch.GenesisAccount{
 		ChainID: chainID,
 		Address: address,
 		Coins:   Coins(),
@@ -45,8 +45,8 @@ func VestingOptions() launch.VestingOptions {
 }
 
 // VestingAccount returns a sample VestingAccount
-func VestingAccount(chainID uint64, address string) *launch.VestingAccount {
-	return &launch.VestingAccount{
+func VestingAccount(chainID uint64, address string) launch.VestingAccount {
+	return launch.VestingAccount{
 		ChainID:         chainID,
 		Address:         address,
 		StartingBalance: Coins(),
@@ -62,8 +62,8 @@ func AccountRemoval(address string) *launch.AccountRemoval {
 }
 
 // GenesisValidator returns a sample GenesisValidator
-func GenesisValidator(chainID uint64, address string) *launch.GenesisValidator {
-	return &launch.GenesisValidator{
+func GenesisValidator(chainID uint64, address string) launch.GenesisValidator {
+	return launch.GenesisValidator{
 		ChainID:        chainID,
 		Address:        address,
 		GenTx:          Bytes(200),
@@ -74,15 +74,15 @@ func GenesisValidator(chainID uint64, address string) *launch.GenesisValidator {
 }
 
 // ValidatorRemoval returns a sample ValidatorRemoval
-func ValidatorRemoval(address string) *launch.ValidatorRemoval {
-	return &launch.ValidatorRemoval{
+func ValidatorRemoval(address string) launch.ValidatorRemoval {
+	return launch.ValidatorRemoval{
 		ValAddress: address,
 	}
 }
 
 // RequestWithContent creates a launch request object with chain id and content
-func RequestWithContent(chainID uint64, content launch.RequestContent) *launch.Request {
-	return &launch.Request{
+func RequestWithContent(chainID uint64, content launch.RequestContent) launch.Request {
+	return launch.Request{
 		ChainID:   chainID,
 		Creator:   AccAddress(),
 		CreatedAt: time.Now().Unix(),
@@ -108,7 +108,7 @@ func GenesisAccountContent(chainID uint64, address string) launch.RequestContent
 }
 
 // Request returns a sample Request
-func Request(chainID uint64) *launch.Request {
+func Request(chainID uint64) launch.Request {
 	content := GenesisAccountContent(chainID, AccAddress())
 	return RequestWithContent(chainID, content)
 }
@@ -204,28 +204,28 @@ func LaunchGenesisState() launch.GenesisState {
 
 	return launch.GenesisState{
 		ChainList: []launch.Chain{
-			*Chain(chainID1, Uint64()),
-			*Chain(chainID2, Uint64()),
+			Chain(chainID1, Uint64()),
+			Chain(chainID2, Uint64()),
 		},
 		ChainCount: 10,
 		GenesisAccountList: []launch.GenesisAccount{
-			*GenesisAccount(chainID1, AccAddress()),
-			*GenesisAccount(chainID1, AccAddress()),
-			*GenesisAccount(chainID2, AccAddress()),
+			GenesisAccount(chainID1, AccAddress()),
+			GenesisAccount(chainID1, AccAddress()),
+			GenesisAccount(chainID2, AccAddress()),
 		},
 		VestingAccountList: []launch.VestingAccount{
-			*VestingAccount(chainID1, AccAddress()),
-			*VestingAccount(chainID1, AccAddress()),
-			*VestingAccount(chainID2, AccAddress()),
+			VestingAccount(chainID1, AccAddress()),
+			VestingAccount(chainID1, AccAddress()),
+			VestingAccount(chainID2, AccAddress()),
 		},
 		GenesisValidatorList: []launch.GenesisValidator{
-			*GenesisValidator(chainID1, AccAddress()),
-			*GenesisValidator(chainID1, AccAddress()),
-			*GenesisValidator(chainID2, AccAddress()),
+			GenesisValidator(chainID1, AccAddress()),
+			GenesisValidator(chainID1, AccAddress()),
+			GenesisValidator(chainID2, AccAddress()),
 		},
 		RequestList: []launch.Request{
-			*Request(chainID1),
-			*Request(chainID2),
+			Request(chainID1),
+			Request(chainID2),
 		},
 		RequestCountList: []launch.RequestCount{
 			{
diff --git a/x/launch/client/cli/query_chain_test.go b/x/launch/client/cli/query_chain_test.go
@@ -23,7 +23,7 @@ func networkWithFooObjects(t *testing.T, n int) (*network.Network, []types.Chain
 	require.NoError(t, cfg.Codec.UnmarshalJSON(cfg.GenesisState[types.ModuleName], &state))
 
 	for i := 0; i < n; i++ {
-		chain := *sample.Chain(uint64(i), uint64(i))
+		chain := sample.Chain(uint64(i), uint64(i))
 		state.ChainList = append(
 			state.ChainList,
 			chain,
diff --git a/x/launch/client/cli/query_genesis_account_test.go b/x/launch/client/cli/query_genesis_account_test.go
@@ -30,7 +30,7 @@ func networkWithGenesisAccountObjects(t *testing.T, n int) (*network.Network, []
 	for i := 0; i < n; i++ {
 		state.GenesisAccountList = append(
 			state.GenesisAccountList,
-			*sample.GenesisAccount(uint64(0), strconv.Itoa(i)),
+			sample.GenesisAccount(uint64(0), strconv.Itoa(i)),
 		)
 	}
 	buf, err := cfg.Codec.MarshalJSON(&state)
diff --git a/x/launch/client/cli/query_genesis_validator_test.go b/x/launch/client/cli/query_genesis_validator_test.go
@@ -30,7 +30,7 @@ func networkWithGenesisValidatorObjects(t *testing.T, n int) (*network.Network,
 	for i := 0; i < n; i++ {
 		state.GenesisValidatorList = append(
 			state.GenesisValidatorList,
-			*sample.GenesisValidator(uint64(0), strconv.Itoa(i)),
+			sample.GenesisValidator(uint64(0), strconv.Itoa(i)),
 		)
 	}
 	buf, err := cfg.Codec.MarshalJSON(&state)
diff --git a/x/launch/client/cli/query_request_test.go b/x/launch/client/cli/query_request_test.go
@@ -27,7 +27,7 @@ func networkWithRequestObjects(t *testing.T, n int) (*network.Network, []types.R
 	require.NoError(t, cfg.Codec.UnmarshalJSON(cfg.GenesisState[types.ModuleName], &state))
 
 	for i := 0; i < n; i++ {
-		request := *sample.Request(0)
+		request := sample.Request(0)
 		request.RequestID = uint64(i)
 		state.RequestList = append(
 			state.RequestList,
diff --git a/x/launch/client/cli/query_vesting_account_test.go b/x/launch/client/cli/query_vesting_account_test.go
@@ -29,7 +29,7 @@ func networkWithVestingAccountObjects(t *testing.T, n int) (*network.Network, []
 	for i := 0; i < n; i++ {
 		state.VestingAccountList = append(
 			state.VestingAccountList,
-			*sample.VestingAccount(0, strconv.Itoa(i)),
+			sample.VestingAccount(0, strconv.Itoa(i)),
 		)
 	}
 	buf, err := cfg.Codec.MarshalJSON(&state)
diff --git a/x/launch/keeper/genesis_account_test.go b/x/launch/keeper/genesis_account_test.go
@@ -15,7 +15,7 @@ import (
 func createNGenesisAccount(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.GenesisAccount {
 	items := make([]types.GenesisAccount, n)
 	for i := range items {
-		items[i] = *sample.GenesisAccount(uint64(i), strconv.Itoa(i))
+		items[i] = sample.GenesisAccount(uint64(i), strconv.Itoa(i))
 		keeper.SetGenesisAccount(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/keeper/genesis_validator_test.go b/x/launch/keeper/genesis_validator_test.go
@@ -18,7 +18,7 @@ var _ = strconv.IntSize
 func createNGenesisValidator(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.GenesisValidator {
 	items := make([]types.GenesisValidator, n)
 	for i := range items {
-		items[i] = *sample.GenesisValidator(uint64(i), strconv.Itoa(i))
+		items[i] = sample.GenesisValidator(uint64(i), strconv.Itoa(i))
 		keeper.SetGenesisValidator(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/keeper/grpc_query_genesis_account_test.go b/x/launch/keeper/grpc_query_genesis_account_test.go
@@ -18,7 +18,7 @@ import (
 func createNGenesisAccountForChainID(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID uint64) []types.GenesisAccount {
 	items := make([]types.GenesisAccount, n)
 	for i := range items {
-		items[i] = *sample.GenesisAccount(chainID, strconv.Itoa(i))
+		items[i] = sample.GenesisAccount(chainID, strconv.Itoa(i))
 		keeper.SetGenesisAccount(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/keeper/grpc_query_genesis_validator_test.go b/x/launch/keeper/grpc_query_genesis_validator_test.go
@@ -21,7 +21,7 @@ var _ = strconv.IntSize
 func createNGenesisValidatorForChainID(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID uint64) []types.GenesisValidator {
 	items := make([]types.GenesisValidator, n)
 	for i := range items {
-		items[i] = *sample.GenesisValidator(chainID, strconv.Itoa(i))
+		items[i] = sample.GenesisValidator(chainID, strconv.Itoa(i))
 		keeper.SetGenesisValidator(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/keeper/grpc_query_vesting_account_test.go b/x/launch/keeper/grpc_query_vesting_account_test.go
@@ -21,7 +21,7 @@ var _ = strconv.IntSize
 func createNVestingAccountForChainID(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID uint64) []types.VestingAccount {
 	items := make([]types.VestingAccount, n)
 	for i := range items {
-		items[i] = *sample.VestingAccount(chainID, strconv.Itoa(i))
+		items[i] = sample.VestingAccount(chainID, strconv.Itoa(i))
 		keeper.SetVestingAccount(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/keeper/request_test.go b/x/launch/keeper/request_test.go
@@ -23,7 +23,7 @@ func createRequests(
 ) []types.Request {
 	items := make([]types.Request, len(contents))
 	for i, content := range contents {
-		items[i] = *sample.RequestWithContent(chainID, content)
+		items[i] = sample.RequestWithContent(chainID, content)
 		id := keeper.AppendRequest(ctx, items[i])
 		items[i].RequestID = id
 	}
@@ -33,7 +33,7 @@ func createRequests(
 func createNRequest(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.Request {
 	items := make([]types.Request, n)
 	for i := range items {
-		items[i] = *sample.Request(0)
+		items[i] = sample.Request(0)
 		id := keeper.AppendRequest(ctx, items[i])
 		items[i].RequestID = id
 	}
@@ -99,49 +99,49 @@ func TestApplyRequest(t *testing.T) {
 	}{
 		{
 			name:    "test GenesisAccount content",
-			request: *sample.RequestWithContent(chainID, contents[0]),
+			request: sample.RequestWithContent(chainID, contents[0]),
 		}, {
 			name:    "test duplicated GenesisAccount content",
-			request: *sample.RequestWithContent(chainID, contents[0]),
+			request: sample.RequestWithContent(chainID, contents[0]),
 			wantErr: true,
 		}, {
 			name:    "test genesis AccountRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[1]),
+			request: sample.RequestWithContent(chainID, contents[1]),
 		}, {
 			name:    "test not found genesis AccountRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[1]),
+			request: sample.RequestWithContent(chainID, contents[1]),
 			wantErr: true,
 		}, {
 			name:    "test VestingAccount content",
-			request: *sample.RequestWithContent(chainID, contents[2]),
+			request: sample.RequestWithContent(chainID, contents[2]),
 		}, {
 			name:    "test duplicated VestingAccount content",
-			request: *sample.RequestWithContent(chainID, contents[2]),
+			request: sample.RequestWithContent(chainID, contents[2]),
 			wantErr: true,
 		}, {
 			name:    "test vesting AccountRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[3]),
+			request: sample.RequestWithContent(chainID, contents[3]),
 		}, {
 			name:    "test not found vesting AccountRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[3]),
+			request: sample.RequestWithContent(chainID, contents[3]),
 			wantErr: true,
 		}, {
 			name:    "test GenesisValidator content",
-			request: *sample.RequestWithContent(chainID, contents[4]),
+			request: sample.RequestWithContent(chainID, contents[4]),
 		}, {
 			name:    "test duplicated GenesisValidator content",
-			request: *sample.RequestWithContent(chainID, contents[4]),
+			request: sample.RequestWithContent(chainID, contents[4]),
 			wantErr: true,
 		}, {
 			name:    "test ValidatorRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[5]),
+			request: sample.RequestWithContent(chainID, contents[5]),
 		}, {
 			name:    "test not found ValidatorRemoval content",
-			request: *sample.RequestWithContent(chainID, contents[5]),
+			request: sample.RequestWithContent(chainID, contents[5]),
 			wantErr: true,
 		}, {
 			name:    "test request with invalid parameters",
-			request: *sample.RequestWithContent(chainID, invalidContent),
+			request: sample.RequestWithContent(chainID, invalidContent),
 			wantErr: true,
 		},
 	}
diff --git a/x/launch/keeper/vesting_account_test.go b/x/launch/keeper/vesting_account_test.go
@@ -18,7 +18,7 @@ var _ = strconv.IntSize
 func createNVestingAccount(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.VestingAccount {
 	items := make([]types.VestingAccount, n)
 	for i := range items {
-		items[i] = *sample.VestingAccount(uint64(i), strconv.Itoa(i))
+		items[i] = sample.VestingAccount(uint64(i), strconv.Itoa(i))
 		keeper.SetVestingAccount(ctx, items[i])
 	}
 	return items
diff --git a/x/launch/types/chain_test.go b/x/launch/types/chain_test.go
@@ -9,10 +9,10 @@ import (
 )
 
 func TestChain_Validate(t *testing.T) {
-	invalidGenesisChainID := *sample.Chain(0, 0)
+	invalidGenesisChainID := sample.Chain(0, 0)
 	invalidGenesisChainID.GenesisChainID = "invalid"
 
-	invalidLaunchTimestamp := *sample.Chain(0, 0)
+	invalidLaunchTimestamp := sample.Chain(0, 0)
 	invalidLaunchTimestamp.LaunchTriggered = true
 
 	for _, tc := range []struct {
@@ -22,7 +22,7 @@ func TestChain_Validate(t *testing.T) {
 	}{
 		{
 			desc:  "valid chain",
-			chain: *sample.Chain(0, 0),
+			chain: sample.Chain(0, 0),
 			valid: true,
 		},
 		{
diff --git a/x/launch/types/genesis.go b/x/launch/types/genesis.go
@@ -14,7 +14,7 @@ func DefaultGenesis() *GenesisState {
 		ChainList:            []Chain{},
 		ChainCount:           0,
 		GenesisAccountList:   []GenesisAccount{},
-		VestingAccountList:    []VestingAccount{},
+		VestingAccountList:   []VestingAccount{},
 		GenesisValidatorList: []GenesisValidator{},
 		RequestList:          []Request{},
 		RequestCountList:     []RequestCount{},
diff --git a/x/launch/types/genesis_test.go b/x/launch/types/genesis_test.go
@@ -15,7 +15,7 @@ var (
 	addr1            = sample.AccAddress()
 	addr2            = sample.AccAddress()
 	vestingAddress   = sample.AccAddress()
-	genesisValidator = *sample.GenesisValidator(chainID1, addr1)
+	genesisValidator = sample.GenesisValidator(chainID1, addr1)
 	genesisChainID   = sample.GenesisChainID()
 
 	// Those are samples we can use for each fields when they are not the one to test
@@ -233,7 +233,7 @@ func TestGenesisState_Validate(t *testing.T) {
 				ChainList:  sampleChainList,
 				ChainCount: 10,
 				GenesisValidatorList: []types.GenesisValidator{
-					*sample.GenesisValidator(noExistChainID, addr1),
+					sample.GenesisValidator(noExistChainID, addr1),
 				},
 			},
 			shouldBeValid: false,
@@ -244,8 +244,8 @@ func TestGenesisState_Validate(t *testing.T) {
 				ChainList:  sampleChainList,
 				ChainCount: 10,
 				GenesisValidatorList: []types.GenesisValidator{
-					*sample.GenesisValidator(chainID1, addr1),
-					*sample.GenesisValidator(chainID1, addr1),
+					sample.GenesisValidator(chainID1, addr1),
+					sample.GenesisValidator(chainID1, addr1),
 				},
 			},
 			shouldBeValid: false,
@@ -256,7 +256,7 @@ func TestGenesisState_Validate(t *testing.T) {
 				ChainList:  sampleChainList,
 				ChainCount: 10,
 				GenesisValidatorList: []types.GenesisValidator{
-					*sample.GenesisValidator(noExistChainID, addr1),
+					sample.GenesisValidator(noExistChainID, addr1),
 				},
 			},
 			shouldBeValid: false,

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func networkWithGenesisAccountObjects(t testing.T, n int) (network.Network, []`
`30`	`30`	`for i := 0; i < n; i++ {`
`31`	`31`	`state.GenesisAccountList = append(`
`32`	`32`	`state.GenesisAccountList,`
`33`		`- *sample.GenesisAccount(uint64(0), strconv.Itoa(i)),`
	`33`	`+ sample.GenesisAccount(uint64(0), strconv.Itoa(i)),`
`34`	`34`	`)`
`35`	`35`	`}`
`36`	`36`	`buf, err := cfg.Codec.MarshalJSON(&state)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func networkWithVestingAccountObjects(t testing.T, n int) (network.Network, []`
`29`	`29`	`for i := 0; i < n; i++ {`
`30`	`30`	`state.VestingAccountList = append(`
`31`	`31`	`state.VestingAccountList,`
`32`		`- *sample.VestingAccount(0, strconv.Itoa(i)),`
	`32`	`+ sample.VestingAccount(0, strconv.Itoa(i)),`
`33`	`33`	`)`
`34`	`34`	`}`
`35`	`35`	`buf, err := cfg.Codec.MarshalJSON(&state)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`func createNGenesisAccount(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.GenesisAccount {`
`16`	`16`	`items := make([]types.GenesisAccount, n)`
`17`	`17`	`for i := range items {`
`18`		`- items[i] = *sample.GenesisAccount(uint64(i), strconv.Itoa(i))`
	`18`	`+ items[i] = sample.GenesisAccount(uint64(i), strconv.Itoa(i))`
`19`	`19`	`keeper.SetGenesisAccount(ctx, items[i])`
`20`	`20`	`}`
`21`	`21`	`return items`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ var _ = strconv.IntSize`
`18`	`18`	`func createNGenesisValidator(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.GenesisValidator {`
`19`	`19`	`items := make([]types.GenesisValidator, n)`
`20`	`20`	`for i := range items {`
`21`		`- items[i] = *sample.GenesisValidator(uint64(i), strconv.Itoa(i))`
	`21`	`+ items[i] = sample.GenesisValidator(uint64(i), strconv.Itoa(i))`
`22`	`22`	`keeper.SetGenesisValidator(ctx, items[i])`
`23`	`23`	`}`
`24`	`24`	`return items`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`func createNGenesisAccountForChainID(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID uint64) []types.GenesisAccount {`
`19`	`19`	`items := make([]types.GenesisAccount, n)`
`20`	`20`	`for i := range items {`
`21`		`- items[i] = *sample.GenesisAccount(chainID, strconv.Itoa(i))`
	`21`	`+ items[i] = sample.GenesisAccount(chainID, strconv.Itoa(i))`
`22`	`22`	`keeper.SetGenesisAccount(ctx, items[i])`
`23`	`23`	`}`
`24`	`24`	`return items`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ var _ = strconv.IntSize`
`21`	`21`	`func createNGenesisValidatorForChainID(keeper *keeper.Keeper, ctx sdk.Context, n int, chainID uint64) []types.GenesisValidator {`
`22`	`22`	`items := make([]types.GenesisValidator, n)`
`23`	`23`	`for i := range items {`
`24`		`- items[i] = *sample.GenesisValidator(chainID, strconv.Itoa(i))`
	`24`	`+ items[i] = sample.GenesisValidator(chainID, strconv.Itoa(i))`
`25`	`25`	`keeper.SetGenesisValidator(ctx, items[i])`
`26`	`26`	`}`
`27`	`27`	`return items`