Client improvements

asserter/block.go

@@ -15,7 +15,6 @@
 package asserter
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"math/big"
@@ -234,7 +233,6 @@ func Timestamp(timestamp int64) error {
 
 // Block runs a basic set of assertions for each returned block.
 func (a *Asserter) Block(
-	ctx context.Context,
 	block *models.Block,
 ) error {
 	if block == nil {

asserter/block_test.go

@@ -561,7 +561,7 @@ func TestBlock(t *testing.T) {
 			)
 			assert.NoError(t, err)
 
-			err = asserter.Block(context.Background(), test.block)
+			err = asserter.Block(test.block)
 			assert.Equal(t, test.err, err)
 		})
 	}

client/api_account.go

@@ -43,7 +43,7 @@ type AccountAPIService service
 // optional BlockIdentifier.
 func (a *AccountAPIService) AccountBalance(
 	ctx _context.Context,
-	accountBalanceRequest models.AccountBalanceRequest,
+	accountBalanceRequest *models.AccountBalanceRequest,
 ) (*models.AccountBalanceResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -71,7 +71,7 @@ func (a *AccountAPIService) AccountBalance(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &accountBalanceRequest
+	localVarPostBody = accountBalanceRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {

client/api_block.go

@@ -39,7 +39,7 @@ type BlockAPIService service
 // be done to get all transaction information.
 func (a *BlockAPIService) Block(
 	ctx _context.Context,
-	blockRequest models.BlockRequest,
+	blockRequest *models.BlockRequest,
 ) (*models.BlockResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -67,7 +67,7 @@ func (a *BlockAPIService) Block(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &blockRequest
+	localVarPostBody = blockRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {
@@ -118,7 +118,7 @@ func (a *BlockAPIService) Block(
 // /data directory (on a path that does not conflict with the node).
 func (a *BlockAPIService) BlockTransaction(
 	ctx _context.Context,
-	blockTransactionRequest models.BlockTransactionRequest,
+	blockTransactionRequest *models.BlockTransactionRequest,
 ) (*models.BlockTransactionResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -146,7 +146,7 @@ func (a *BlockAPIService) BlockTransaction(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &blockTransactionRequest
+	localVarPostBody = blockTransactionRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {

client/api_construction.go

@@ -41,7 +41,7 @@ type ConstructionAPIService service
 // not need to be broken out into a key-value mapping and can be returned as a blob.
 func (a *ConstructionAPIService) TransactionConstruction(
 	ctx _context.Context,
-	transactionConstructionRequest models.TransactionConstructionRequest,
+	transactionConstructionRequest *models.TransactionConstructionRequest,
 ) (*models.TransactionConstructionResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -69,7 +69,7 @@ func (a *ConstructionAPIService) TransactionConstruction(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &transactionConstructionRequest
+	localVarPostBody = transactionConstructionRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {
@@ -113,7 +113,7 @@ func (a *ConstructionAPIService) TransactionConstruction(
 // Otherwise, it should return an error.
 func (a *ConstructionAPIService) TransactionSubmit(
 	ctx _context.Context,
-	transactionSubmitRequest models.TransactionSubmitRequest,
+	transactionSubmitRequest *models.TransactionSubmitRequest,
 ) (*models.TransactionSubmitResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -141,7 +141,7 @@ func (a *ConstructionAPIService) TransactionSubmit(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &transactionSubmitRequest
+	localVarPostBody = transactionSubmitRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {

client/api_mempool.go

@@ -36,7 +36,7 @@ type MempoolAPIService service
 // Mempool Get all Transaction Identifiers in the mempool
 func (a *MempoolAPIService) Mempool(
 	ctx _context.Context,
-	mempoolRequest models.MempoolRequest,
+	mempoolRequest *models.MempoolRequest,
 ) (*models.MempoolResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -64,7 +64,7 @@ func (a *MempoolAPIService) Mempool(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &mempoolRequest
+	localVarPostBody = mempoolRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {
@@ -110,7 +110,7 @@ func (a *MempoolAPIService) Mempool(
 // in a block.
 func (a *MempoolAPIService) MempoolTransaction(
 	ctx _context.Context,
-	mempoolTransactionRequest models.MempoolTransactionRequest,
+	mempoolTransactionRequest *models.MempoolTransactionRequest,
 ) (*models.MempoolTransactionResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -138,7 +138,7 @@ func (a *MempoolAPIService) MempoolTransaction(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &mempoolTransactionRequest
+	localVarPostBody = mempoolTransactionRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {

client/api_network.go

@@ -37,7 +37,7 @@ type NetworkAPIService service
 // method also returns the methods, operation types, and operation statuses the node supports.
 func (a *NetworkAPIService) NetworkStatus(
 	ctx _context.Context,
-	networkStatusRequest models.NetworkStatusRequest,
+	networkStatusRequest *models.NetworkStatusRequest,
 ) (*models.NetworkStatusResponse, *models.Error, error) {
 	var (
 		localVarPostBody interface{}
@@ -65,7 +65,7 @@ func (a *NetworkAPIService) NetworkStatus(
 		localVarHeaderParams["Accept"] = localVarHTTPHeaderAccept
 	}
 	// body params
-	localVarPostBody = &networkStatusRequest
+	localVarPostBody = networkStatusRequest
 
 	r, err := a.client.prepareRequest(ctx, localVarPath, localVarPostBody, localVarHeaderParams)
 	if err != nil {

fetcher/account.go

@@ -33,7 +33,7 @@ func (f *Fetcher) UnsafeAccountBalance(
 	account *models.AccountIdentifier,
 ) (*models.BlockIdentifier, []*models.Balance, error) {
 	balance, _, err := f.rosettaClient.AccountAPI.AccountBalance(ctx,
-		models.AccountBalanceRequest{
+		&models.AccountBalanceRequest{
 			NetworkIdentifier: network,
 			AccountIdentifier: account,
 		},

fetcher/block.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/coinbase/rosetta-sdk-go/asserter"
 	"github.com/coinbase/rosetta-sdk-go/models"
 
 	"golang.org/x/sync/errgroup"
@@ -58,7 +59,7 @@ func (f *Fetcher) fetchChannelTransactions(
 ) error {
 	for transactionIdentifier := range txsToFetch {
 		tx, _, err := f.rosettaClient.BlockAPI.BlockTransaction(ctx,
-			models.BlockTransactionRequest{
+			&models.BlockTransactionRequest{
 				NetworkIdentifier:     network,
 				BlockIdentifier:       block,
 				TransactionIdentifier: transactionIdentifier,
@@ -135,7 +136,7 @@ func (f *Fetcher) UnsafeBlock(
 	network *models.NetworkIdentifier,
 	blockIdentifier *models.PartialBlockIdentifier,
 ) (*models.Block, error) {
-	blockResponse, _, err := f.rosettaClient.BlockAPI.Block(ctx, models.BlockRequest{
+	blockResponse, _, err := f.rosettaClient.BlockAPI.Block(ctx, &models.BlockRequest{
 		NetworkIdentifier: network,
 		BlockIdentifier:   blockIdentifier,
 	})
@@ -182,7 +183,7 @@ func (f *Fetcher) Block(
 		return nil, err
 	}
 
-	if err := f.Asserter.Block(ctx, block); err != nil {
+	if err := f.Asserter.Block(block); err != nil {
 		return nil, err
 	}
 
@@ -202,6 +203,10 @@ func (f *Fetcher) BlockRetry(
 		return nil, errors.New("asserter not initialized")
 	}
 
+	if err := asserter.PartialBlockIdentifier(blockIdentifier); err != nil {
+		return nil, err
+	}
+
 	backoffRetries := backoffRetries(maxElapsedTime, maxRetries)
 
 	for ctx.Err() == nil {
@@ -214,7 +219,14 @@ func (f *Fetcher) BlockRetry(
 			return block, nil
 		}
 
-		if !tryAgain(fmt.Sprintf("block %d", blockIdentifier.Index), backoffRetries, err) {
+		var blockFetchErr string
+		if blockIdentifier.Index != nil {
+			blockFetchErr = fmt.Sprintf("block %d", *blockIdentifier.Index)
+		} else {
+			blockFetchErr = fmt.Sprintf("block %s", *blockIdentifier.Hash)
+		}
+
+		if !tryAgain(blockFetchErr, backoffRetries, err) {
 			break
 		}
 	}

fetcher/construction.go

@@ -32,7 +32,7 @@ func (f *Fetcher) ConstructionMetadata(
 	method *string,
 ) (*models.Amount, *map[string]interface{}, error) {
 	metadata, _, err := f.rosettaClient.ConstructionAPI.TransactionConstruction(ctx,
-		models.TransactionConstructionRequest{
+		&models.TransactionConstructionRequest{
 			NetworkIdentifier: network,
 			AccountIdentifier: account,
 			Method:            method,
@@ -61,7 +61,7 @@ func (f *Fetcher) ConstructionSubmit(
 
 	submitResponse, _, err := f.rosettaClient.ConstructionAPI.TransactionSubmit(
 		ctx,
-		models.TransactionSubmitRequest{
+		&models.TransactionSubmitRequest{
 			SignedTransaction: signedTransaction,
 		},
 	)

fetcher/mempool.go

@@ -29,9 +29,12 @@ func (f *Fetcher) UnsafeMempool(
 	ctx context.Context,
 	network *models.NetworkIdentifier,
 ) ([]*models.TransactionIdentifier, error) {
-	mempool, _, err := f.rosettaClient.MempoolAPI.Mempool(ctx, models.MempoolRequest{
-		NetworkIdentifier: network,
-	})
+	mempool, _, err := f.rosettaClient.MempoolAPI.Mempool(
+		ctx,
+		&models.MempoolRequest{
+			NetworkIdentifier: network,
+		},
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -64,8 +67,9 @@ func (f *Fetcher) UnsafeMempoolTransaction(
 	network *models.NetworkIdentifier,
 	transaction *models.TransactionIdentifier,
 ) (*models.Transaction, *map[string]interface{}, error) {
-	mempoolTransaction, _, err := f.rosettaClient.MempoolAPI.MempoolTransaction(ctx,
-		models.MempoolTransactionRequest{
+	mempoolTransaction, _, err := f.rosettaClient.MempoolAPI.MempoolTransaction(
+		ctx,
+		&models.MempoolTransactionRequest{
 			NetworkIdentifier:     network,
 			TransactionIdentifier: transaction,
 		},

fetcher/network.go

@@ -32,7 +32,7 @@ func (f *Fetcher) UnsafeNetworkStatus(
 ) (*models.NetworkStatusResponse, error) {
 	networkStatus, _, err := f.rosettaClient.NetworkAPI.NetworkStatus(
 		ctx,
-		models.NetworkStatusRequest{
+		&models.NetworkStatusRequest{
 			Metadata: metadata,
 		},
 	)

fetcher/utils.go

@@ -18,9 +18,23 @@ import (
 	"log"
 	"time"
 
+	"github.com/coinbase/rosetta-sdk-go/models"
+
 	"github.com/cenkalti/backoff"
 )
 
+// PartialBlockIdentifier constructs a PartialBlockIdentifier
+// from a BlockIdentifier. This is useful when making block requests
+// with the fetcher.
+func PartialBlockIdentifier(
+	blockIdentifier *models.BlockIdentifier,
+) *models.PartialBlockIdentifier {
+	return &models.PartialBlockIdentifier{
+		Hash:  &blockIdentifier.Hash,
+		Index: &blockIdentifier.Index,
+	}
+}
+
 // backoffRetries creates the backoff.BackOff struct used by all
 // *Retry functions in the fetcher.
 func backoffRetries(

templates/client/api.mustache

@@ -21,7 +21,7 @@ type {{classname}}Service service
 {{#operation}}
 
 // {{operationId}}{{#notes}} {{notes}}{{/notes}}
-func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams}}, {{/hasParams}}{{#allParams}}{{#required}}{{paramName}} models.{{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}localVarOptionals *{{#structPrefix}}{{&classname}}{{/structPrefix}}{{{nickname}}}Opts{{/hasOptionalParams}}) ({{#returnType}}*models.{{{returnType}}}, {{/returnType}} *models.Error, error) {
+func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams}}, {{/hasParams}}{{#allParams}}{{#required}}{{paramName}} *models.{{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}localVarOptionals *{{#structPrefix}}{{&classname}}{{/structPrefix}}{{{nickname}}}Opts{{/hasOptionalParams}}) ({{#returnType}}*models.{{{returnType}}}, {{/returnType}} *models.Error, error) {
 	var (
 		localVarPostBody     interface{}
 	)
@@ -66,7 +66,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 {{#hasBodyParam}}
 {{#bodyParams}}
   // body params
-	localVarPostBody = &{{paramName}}
+	localVarPostBody = {{paramName}}
 {{/bodyParams}}
 {{/hasBodyParam}}