feat: remove fake websocket code from GetTransactionStatus

Signed-off-by: Simon Gellis <[email protected]>

Author: SupernaviX

internal/blockchain/cardano/cardano.go

@@ -38,15 +38,6 @@ import (
 	"github.com/hyperledger/firefly/pkg/core"
 )
 
-const (
-	cardanoTxStatusPending string = "Pending"
-)
-
-const (
-	ReceiptTransactionSuccess string = "TransactionSuccess"
-	ReceiptTransactionFailed  string = "TransactionFailed"
-)
-
 type Cardano struct {
 	ctx                context.Context
 	cancelCtx          context.CancelFunc
@@ -474,37 +465,6 @@ func (c *Cardano) GetTransactionStatus(ctx context.Context, operation *core.Oper
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgCardanoconnectRESTErr)
 	}
 
-	receiptInfo := statusResponse.GetObject("receipt")
-	txStatus := statusResponse.GetString("status")
-
-	if txStatus != "" {
-		var replyType string
-		if txStatus == "Succeeded" {
-			replyType = ReceiptTransactionSuccess
-		} else {
-			replyType = ReceiptTransactionFailed
-		}
-		// If the status has changed, mock up blockchain receipt as if we'd received it
-		// as a web socket notification
-		if (operation.Status == core.OpStatusPending || operation.Status == core.OpStatusInitialized) && txStatus != cardanoTxStatusPending {
-			receipt := &common.BlockchainReceiptNotification{
-				Headers: common.BlockchainReceiptHeaders{
-					ReceiptID: statusResponse.GetString("id"),
-					ReplyType: replyType,
-				},
-				TxHash:     statusResponse.GetString("transactionHash"),
-				Message:    statusResponse.GetString("errorMessage"),
-				ProtocolID: receiptInfo.GetString("protocolId")}
-			err := common.HandleReceipt(ctx, operation.Namespace, c, receipt, c.callbacks)
-			if err != nil {
-				log.L(ctx).Warnf("Failed to handle receipt")
-			}
-		}
-	} else {
-		// Don't expect to get here so issue a warning
-		log.L(ctx).Warnf("Transaction status didn't include txStatus information")
-	}
-
 	return statusResponse, nil
 }
 

internal/blockchain/cardano/cardano_test.go

@@ -867,19 +867,9 @@ func TestGetTransactionStatusSuccess(t *testing.T) {
 			return httpmock.NewJsonResponderOrPanic(200, transactionStatus)(req)
 		})
 
-	tm := &coremocks.OperationCallbacks{}
-	c.SetOperationHandler("ns1", tm)
-	tm.On("OperationUpdate", mock.MatchedBy(func(update *core.OperationUpdateAsync) bool {
-		return update.NamespacedOpID == "ns1:9ffc50ff-6bfe-4502-adc7-93aea54cc059" &&
-			update.Status == core.OpStatusSucceeded &&
-			update.BlockchainTXID == "txHash" &&
-			update.Plugin == "cardano"
-	})).Return(errors.New("won't stop processing"))
-
 	status, err := c.GetTransactionStatus(context.Background(), op)
 	assert.NoError(t, err)
 	assert.NotNil(t, status)
-	tm.AssertExpectations(t)
 }
 
 func TestGetTransactionStatusFailure(t *testing.T) {
@@ -904,19 +894,9 @@ func TestGetTransactionStatusFailure(t *testing.T) {
 			return httpmock.NewJsonResponderOrPanic(200, transactionStatus)(req)
 		})
 
-	tm := &coremocks.OperationCallbacks{}
-	c.SetOperationHandler("ns1", tm)
-	tm.On("OperationUpdate", mock.MatchedBy(func(update *core.OperationUpdateAsync) bool {
-		return update.NamespacedOpID == "ns1:9ffc50ff-6bfe-4502-adc7-93aea54cc059" &&
-			update.Status == core.OpStatusFailed &&
-			update.ErrorMessage == "Something went wrong" &&
-			update.Plugin == "cardano"
-	})).Return(errors.New("won't stop processing"))
-
 	status, err := c.GetTransactionStatus(context.Background(), op)
 	assert.NoError(t, err)
 	assert.NotNil(t, status)
-	tm.AssertExpectations(t)
 }
 
 func TestGetTransactionStatusEmptyObject(t *testing.T) {

internal/blockchain/common/common.go

@@ -116,6 +116,12 @@ type BlockchainReceiptNotification struct {
 	ContractLocation *fftypes.JSONAny         `json:"contractLocation,omitempty"`
 }
 
+// possible values of BlockchainReceiptHeaders.ReplyType
+const (
+	ReceiptTransactionSuccess string = "TransactionSuccess"
+	ReceiptTransactionFailed  string = "TransactionFailed"
+)
+
 type BlockchainRESTError struct {
 	Error string `json:"error,omitempty"`
 	// See https://github.com/hyperledger/firefly-transaction-manager/blob/main/pkg/ffcapi/submission_error.go

internal/blockchain/ethereum/ethereum.go

@@ -1,4 +1,4 @@
-// Copyright © 2024 Kaleido, Inc.
+// Copyright © 2025 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -52,11 +52,6 @@ const (
 	ethTxStatusPending string = "Pending"
 )
 
-const (
-	ReceiptTransactionSuccess string = "TransactionSuccess"
-	ReceiptTransactionFailed  string = "TransactionFailed"
-)
-
 type Ethereum struct {
 	ctx                  context.Context
 	cancelCtx            context.CancelFunc
@@ -1209,9 +1204,9 @@ func (e *Ethereum) GetTransactionStatus(ctx context.Context, operation *core.Ope
 	if txStatus != "" {
 		var replyType string
 		if txStatus == "Succeeded" {
-			replyType = ReceiptTransactionSuccess
+			replyType = common.ReceiptTransactionSuccess
 		} else {
-			replyType = ReceiptTransactionFailed
+			replyType = common.ReceiptTransactionFailed
 		}
 		// If the status has changed, mock up blockchain receipt as if we'd received it
 		// as a web socket notification

internal/blockchain/tezos/tezos.go

@@ -1,4 +1,4 @@
-// Copyright © 2024 Kaleido, Inc.
+// Copyright © 2025 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -44,11 +44,6 @@ const (
 	tezosTxStatusPending string = "Pending"
 )
 
-const (
-	ReceiptTransactionSuccess string = "TransactionSuccess"
-	ReceiptTransactionFailed  string = "TransactionFailed"
-)
-
 type Tezos struct {
 	ctx                  context.Context
 	cancelCtx            context.CancelFunc
@@ -576,9 +571,9 @@ func (t *Tezos) GetTransactionStatus(ctx context.Context, operation *core.Operat
 	if txStatus != "" {
 		var replyType string
 		if txStatus == "Succeeded" {
-			replyType = ReceiptTransactionSuccess
+			replyType = common.ReceiptTransactionSuccess
 		} else {
-			replyType = ReceiptTransactionFailed
+			replyType = common.ReceiptTransactionFailed
 		}
 		// If the status has changed, mock up blockchain receipt as if we'd received it
 		// as a web socket notification