Fix style nits in vm clients (#1449)

ava-labs · May 3, 2023 · 99f35bd · 99f35bd
1 parent 0d8c59e
commit 99f35bd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/vms/avm/client.go b/vms/avm/client.go
@@ -243,7 +243,6 @@ func (c *client) GetBlock(ctx context.Context, blkID ids.ID, options ...rpc.Opti
 	if err != nil {
 		return nil, err
 	}
-
 	return formatting.Decode(res.Encoding, res.Block)
 }
 
@@ -256,7 +255,6 @@ func (c *client) GetBlockByHeight(ctx context.Context, height uint64, options ..
 	if err != nil {
 		return nil, err
 	}
-
 	return formatting.Decode(res.Encoding, res.Block)
 }
 
@@ -316,12 +314,7 @@ func (c *client) GetTx(ctx context.Context, txID ids.ID, options ...rpc.Option)
 	if err != nil {
 		return nil, err
 	}
-
-	txBytes, err := formatting.Decode(res.Encoding, res.Tx)
-	if err != nil {
-		return nil, err
-	}
-	return txBytes, nil
+	return formatting.Decode(res.Encoding, res.Tx)
 }
 
 func (c *client) GetUTXOs(

diff --git a/vms/platformvm/client.go b/vms/platformvm/client.go
@@ -723,7 +723,7 @@ func (c *client) GetTx(ctx context.Context, txID ids.ID, options ...rpc.Option)
 }
 
 func (c *client) GetTxStatus(ctx context.Context, txID ids.ID, options ...rpc.Option) (*GetTxStatusResponse, error) {
-	res := new(GetTxStatusResponse)
+	res := &GetTxStatusResponse{}
 	err := c.requester.SendRequest(
 		ctx,
 		"platform.getTxStatus",
@@ -763,7 +763,7 @@ func (c *client) GetStake(
 	validatorsOnly bool,
 	options ...rpc.Option,
 ) (map[ids.ID]uint64, [][]byte, error) {
-	res := new(GetStakeReply)
+	res := &GetStakeReply{}
 	err := c.requester.SendRequest(ctx, "platform.getStake", &GetStakeArgs{
 		JSONAddresses: api.JSONAddresses{
 			Addresses: ids.ShortIDsToStrings(addrs),
@@ -792,15 +792,15 @@ func (c *client) GetStake(
 }
 
 func (c *client) GetMinStake(ctx context.Context, subnetID ids.ID, options ...rpc.Option) (uint64, uint64, error) {
-	res := new(GetMinStakeReply)
+	res := &GetMinStakeReply{}
 	err := c.requester.SendRequest(ctx, "platform.getMinStake", &GetMinStakeArgs{
 		SubnetID: subnetID,
 	}, res, options...)
 	return uint64(res.MinValidatorStake), uint64(res.MinDelegatorStake), err
 }
 
 func (c *client) GetTotalStake(ctx context.Context, subnetID ids.ID, options ...rpc.Option) (uint64, error) {
-	res := new(GetTotalStakeReply)
+	res := &GetTotalStakeReply{}
 	err := c.requester.SendRequest(ctx, "platform.getTotalStake", &GetTotalStakeArgs{
 		SubnetID: subnetID,
 	}, res, options...)
@@ -814,7 +814,7 @@ func (c *client) GetTotalStake(ctx context.Context, subnetID ids.ID, options ...
 }
 
 func (c *client) GetMaxStakeAmount(ctx context.Context, subnetID ids.ID, nodeID ids.NodeID, startTime, endTime uint64, options ...rpc.Option) (uint64, error) {
-	res := new(GetMaxStakeAmountReply)
+	res := &GetMaxStakeAmountReply{}
 	err := c.requester.SendRequest(ctx, "platform.getMaxStakeAmount", &GetMaxStakeAmountArgs{
 		SubnetID:  subnetID,
 		NodeID:    nodeID,
@@ -857,13 +857,12 @@ func (c *client) GetValidatorsAt(ctx context.Context, subnetID ids.ID, height ui
 }
 
 func (c *client) GetBlock(ctx context.Context, blockID ids.ID, options ...rpc.Option) ([]byte, error) {
-	response := &api.FormattedBlock{}
+	res := &api.FormattedBlock{}
 	if err := c.requester.SendRequest(ctx, "platform.getBlock", &api.GetBlockArgs{
 		BlockID:  blockID,
 		Encoding: formatting.Hex,
-	}, response, options...); err != nil {
+	}, res, options...); err != nil {
 		return nil, err
 	}
-
-	return formatting.Decode(response.Encoding, response.Block)
+	return formatting.Decode(res.Encoding, res.Block)
 }