Merge pull request #188 from BuxOrg/BUX-528/RemoveUnreserveUtxos

BUX-528: UnreserveUtxos

transactions.go

@@ -75,8 +75,3 @@ func (b *BuxClient) SendToRecipients(ctx context.Context, recipients []*transpor
 
 	return b.RecordTransaction(ctx, hex, draft.ID, metadata)
 }
-
-// UnreserveUtxos unreserves utxos from draft transaction
-func (b *BuxClient) UnreserveUtxos(ctx context.Context, referenceID string) transports.ResponseError {
-	return b.transport.UnreserveUtxos(ctx, referenceID)
-}

transactions_test.go

@@ -264,18 +264,19 @@ func TestTransactions(t *testing.T) {
 		assert.Len(t, txDraft.Outputs, len(fixtures.DraftTx.Configuration.Outputs))
 	})
 
-	t.Run("UnreserveUtxos", func(t *testing.T) {
+	t.Run("CountUtxos", func(t *testing.T) {
 		// given
 		transportHandler := testTransportHandler{
 			Type:      fixtures.RequestType,
-			Path:      "/utxo/unreserve",
+			Path:      "/utxo/count",
 			ClientURL: fixtures.ServerURL,
+			Result:    "0",
 			Client:    WithHTTPClient,
 		}
 		client := getTestBuxClient(transportHandler, false)
 
 		// when
-		err := client.UnreserveUtxos(context.Background(), fixtures.DraftTx.Configuration.Outputs[0].PaymailP4.ReferenceID)
+		_, err := client.GetUtxosCount(context.Background(), map[string]interface{}{}, fixtures.TestMetadata)
 
 		// then
 		assert.NoError(t, err)

transports/http.go

@@ -581,18 +581,6 @@ func (h *TransportHTTP) GetUtxosCount(ctx context.Context, conditions map[string
 	return count, nil
 }
 
-// UnreserveUtxos will unreserve utxos from draft transaction
-func (h *TransportHTTP) UnreserveUtxos(ctx context.Context, referenceID string) ResponseError {
-	jsonStr, err := json.Marshal(map[string]interface{}{
-		FieldReferenceID: referenceID,
-	})
-	if err != nil {
-		return WrapError(err)
-	}
-
-	return h.doHTTPRequest(ctx, http.MethodPatch, "/utxo/unreserve", jsonStr, h.xPriv, h.signRequest, nil)
-}
-
 // createSignatureAccessKey will create a signature for the given access key & body contents
 func createSignatureAccessKey(privateKeyHex, bodyString string) (payload *buxmodels.AuthPayload, err error) {
 	// No key?

transports/interface.go

@@ -49,7 +49,6 @@ type TransactionService interface {
 	GetUtxo(ctx context.Context, txID string, outputIndex uint32) (*buxmodels.Utxo, ResponseError)
 	GetUtxos(ctx context.Context, conditions map[string]interface{}, metadata *buxmodels.Metadata, queryParams *QueryParams) ([]*buxmodels.Utxo, ResponseError)
 	GetUtxosCount(ctx context.Context, conditions map[string]interface{}, metadata *buxmodels.Metadata) (int64, ResponseError)
-	UnreserveUtxos(ctx context.Context, referenceID string) ResponseError
 }
 
 // PaymailService is the paymail related requests