Relax requirement around ConstructionMetadataRequest.Options

coinbase · Oct 5, 2020 · ab1e2cb · ab1e2cb
1 parent d6c284f
commit ab1e2cb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/asserter/errors.go b/asserter/errors.go
@@ -312,12 +312,9 @@ var (
 	ErrAccountBalanceRequestHistoricalBalanceLookupNotSupported = errors.New(
 		"historical balance lookup is not supported",
 	)
-	ErrBlockRequestIsNil                       = errors.New("BlockRequest is nil")
-	ErrBlockTransactionRequestIsNil            = errors.New("BlockTransactionRequest is nil")
-	ErrConstructionMetadataRequestIsNil        = errors.New("ConstructionMetadataRequest is nil")
-	ErrConstructionMetadataRequestOptionsIsNil = errors.New(
-		"ConstructionMetadataRequest.Options is nil",
-	)
+	ErrBlockRequestIsNil                      = errors.New("BlockRequest is nil")
+	ErrBlockTransactionRequestIsNil           = errors.New("BlockTransactionRequest is nil")
+	ErrConstructionMetadataRequestIsNil       = errors.New("ConstructionMetadataRequest is nil")
 	ErrConstructionSubmitRequestIsNil         = errors.New("ConstructionSubmitRequest is nil")
 	ErrConstructionSubmitRequestSignedTxEmpty = errors.New(
 		"ConstructionSubmitRequest.SignedTransaction is empty",
@@ -361,7 +358,6 @@ var (
 		ErrBlockRequestIsNil,
 		ErrBlockTransactionRequestIsNil,
 		ErrConstructionMetadataRequestIsNil,
-		ErrConstructionMetadataRequestOptionsIsNil,
 		ErrConstructionSubmitRequestIsNil,
 		ErrConstructionSubmitRequestSignedTxEmpty,
 		ErrMempoolTransactionRequestIsNil,

diff --git a/asserter/server.go b/asserter/server.go
@@ -159,10 +159,6 @@ func (a *Asserter) ConstructionMetadataRequest(request *types.ConstructionMetada
 		return err
 	}
 
-	if request.Options == nil {
-		return ErrConstructionMetadataRequestOptionsIsNil
-	}
-
 	for _, publicKey := range request.PublicKeys {
 		if err := PublicKey(publicKey); err != nil {
 			return err

diff --git a/asserter/server_test.go b/asserter/server_test.go
@@ -229,9 +229,7 @@ func TestNewWithOptions(t *testing.T) {
 			historicalBalanceLookup: true,
 			supportedNetworks:       []*types.NetworkIdentifier{validNetworkIdentifier},
 			callMethods:             []string{"eth_call"},
-			err: errors.New(
-				"Allow.OperationTypes contains a duplicate PAYMENT",
-			),
+			err:                     errors.New("Allow.OperationTypes contains a duplicate PAYMENT"),
 		},
 		"empty operation type": {
 			supportedOperationTypes: []string{"PAYMENT", ""},
@@ -243,12 +241,9 @@ func TestNewWithOptions(t *testing.T) {
 		"duplicate network identifier": {
 			supportedOperationTypes: []string{"PAYMENT"},
 			historicalBalanceLookup: true,
-			supportedNetworks: []*types.NetworkIdentifier{
-				validNetworkIdentifier,
-				validNetworkIdentifier,
-			},
-			callMethods: []string{"eth_call"},
-			err:         ErrSupportedNetworksDuplicate,
+			supportedNetworks:       []*types.NetworkIdentifier{validNetworkIdentifier, validNetworkIdentifier},
+			callMethods:             []string{"eth_call"},
+			err:                     ErrSupportedNetworksDuplicate,
 		},
 		"nil network identifier": {
 			supportedOperationTypes: []string{"PAYMENT"},
@@ -586,7 +581,6 @@ func TestConstructionMetadataRequest(t *testing.T) {
 			request: &types.ConstructionMetadataRequest{
 				NetworkIdentifier: validNetworkIdentifier,
 			},
-			err: ErrConstructionMetadataRequestOptionsIsNil,
 		},
 		"invalid request with public keys": {
 			request: &types.ConstructionMetadataRequest{