fix: Receipt now gives receipt status error instead of precheck statu…

…s error
hiero-ledger · Apr 1, 2021 · f95c489 · f95c489
1 parent c21e215
commit f95c489
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/transaction_receipt_query.go b/transaction_receipt_query.go
@@ -60,6 +60,10 @@ func (query *TransactionReceiptQuery) GetCost(client *Client) (Hbar, error) {
 }
 
 func transactionReceiptQuery_shouldRetry(status Status, response response) bool {
+	if status == StatusPlatformTransactionNotCreated {
+		return true
+	}
+
 	switch status {
 	case StatusBusy, StatusUnknown, StatusReceiptNotFound:
 		return true
@@ -153,6 +157,10 @@ func (query *TransactionReceiptQuery) Execute(client *Client) (TransactionReceip
 	)
 
 	if err != nil {
+		switch precheckErr := err.(type) {
+		case ErrHederaPreCheckStatus:
+			return TransactionReceipt{}, newErrHederaReceiptStatus(precheckErr.TxID, precheckErr.Status)
+		}
 		return TransactionReceipt{}, err
 	}
 

diff --git a/transaction_record_query.go b/transaction_record_query.go
@@ -60,19 +60,23 @@ func (query *TransactionRecordQuery) GetCost(client *Client) (Hbar, error) {
 }
 
 func transactionRecordQuery_shouldRetry(status Status, response response) bool {
-	switch status {
-	case StatusBusy, StatusUnknown, StatusReceiptNotFound:
+	if status == StatusPlatformTransactionNotCreated {
 		return true
 	}
 
-	if status != StatusOk {
+	switch status {
+	case StatusBusy, StatusUnknown, StatusReceiptNotFound:
+		return true
+	case StatusOk:
+		break
+	default:
 		return false
 	}
 
 	status = Status(response.query.GetTransactionGetRecord().GetTransactionRecord().GetReceipt().GetStatus())
 
 	switch status {
-	case StatusBusy, StatusUnknown, StatusOk, StatusReceiptNotFound, StatusRecordNotFound:
+	case StatusBusy, StatusUnknown, StatusOk, StatusReceiptNotFound:
 		return true
 	default:
 		return false
@@ -184,6 +188,10 @@ func (query *TransactionRecordQuery) Execute(client *Client) (TransactionRecord,
 	)
 
 	if err != nil {
+		switch precheckErr := err.(type) {
+		case ErrHederaPreCheckStatus:
+			return TransactionRecord{}, newErrHederaReceiptStatus(precheckErr.TxID, precheckErr.Status)
+		}
 		return TransactionRecord{}, err
 	}