Merge branch 'main' of https://github.com/aceppaluni/firefly

aceppaluni · aceppaluni · commit 012a7472ac2a · 2025-03-12T13:48:25.000-04:00
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -30,7 +30,6 @@ Fixes # <issue_number_here>
 - [ ] I have performed a self-review of my own code or work.
 - [ ] I have commented my code, particularly in hard-to-understand areas.
 - [ ] My changes generates no new warnings.
-- [ ] My Pull Request title is in format <code>< issue name ></code> eg <code>Added links in the documentation</code>.
 - [ ] I have added tests that prove my fix is effective or that my feature works.
 - [ ] My changes have sufficient code coverage (unit, integration, e2e tests).
 
diff --git a/auditevents/main.go b/auditevents/main.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -94,7 +95,7 @@ func run(host string) error {
 			protocolID := event.BlockchainEvent.ProtocolID
 			fmt.Printf("%-10d %s\n", lastSequence, protocolID)
 			if protocolID <= lastProtocolID {
-				return fmt.Errorf("out of order events detected")
+				return errors.New("out of order events detected")
 			}
 			lastProtocolID = protocolID
 			validated++
diff --git a/ffconfig/main.go b/ffconfig/main.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 
@@ -29,7 +30,7 @@ var rootCmd = &cobra.Command{
 	Short: "FireFly configuration tool",
 	Long:  "Tool for managing and migrating config files for Hyperledger FireFly",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return fmt.Errorf("a command is required")
+		return errors.New("a command is required")
 	},
 }
 
diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go
@@ -21,6 +21,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
@@ -1197,7 +1198,7 @@ func (e *Ethereum) GetTransactionStatus(ctx context.Context, operation *core.Ope
 		SetResult(&statusResponse).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgEthConnectorRESTErr)
diff --git a/internal/blockchain/ethereum/eventstream.go b/internal/blockchain/ethereum/eventstream.go
@@ -21,6 +21,7 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
@@ -161,7 +162,7 @@ func (s *streamManager) deleteEventStream(ctx context.Context, esID string, okNo
 		SetContext(ctx).
 		Delete("/eventstreams/" + esID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
@@ -186,7 +187,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
@@ -282,7 +283,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
diff --git a/internal/blockchain/fabric/eventstream.go b/internal/blockchain/fabric/eventstream.go
@@ -19,6 +19,7 @@ package fabric
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
@@ -137,7 +138,7 @@ func (s *streamManager) deleteEventStream(ctx context.Context, esID string, okNo
 		SetContext(ctx).
 		Delete("/eventstreams/" + esID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
@@ -162,7 +163,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
@@ -261,7 +262,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
diff --git a/internal/blockchain/fabric/fabric.go b/internal/blockchain/fabric/fabric.go
@@ -22,6 +22,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -1118,7 +1119,7 @@ func (f *Fabric) GetTransactionStatus(ctx context.Context, operation *core.Opera
 		SetQueryParam("fly-signer", defaultSigner).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgFabconnectRESTErr)
diff --git a/internal/blockchain/tezos/eventstream.go b/internal/blockchain/tezos/eventstream.go
@@ -22,6 +22,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/hyperledger/firefly-common/pkg/ffresty"
@@ -155,7 +156,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgTezosconnectRESTErr)
@@ -206,7 +207,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgTezosconnectRESTErr)
diff --git a/internal/blockchain/tezos/tezos.go b/internal/blockchain/tezos/tezos.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 
 	"blockwatch.cc/tzgo/micheline"
@@ -564,7 +565,7 @@ func (t *Tezos) GetTransactionStatus(ctx context.Context, operation *core.Operat
 		SetResult(&statusResponse).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgTezosconnectRESTErr)
diff --git a/internal/events/persist_batch.go b/internal/events/persist_batch.go
@@ -19,6 +19,7 @@ package events
 import (
 	"context"
 	"database/sql/driver"
+	"errors"
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
@@ -276,7 +277,7 @@ func (em *eventManager) persistBatchContent(ctx context.Context, batch *core.Bat
 		// Fall back to individual upserts
 		for i, data := range batch.Payload.Data {
 			if err := em.database.UpsertData(ctx, data, database.UpsertOptimizationExisting); err != nil {
-				if err == database.HashMismatch {
+				if errors.Is(err, database.HashMismatch) {
 					log.L(ctx).Errorf("Invalid data entry %d in batch '%s'. Hash mismatch with existing record with same UUID '%s' Hash=%s", i, batch.ID, data.ID, data.Hash)
 					return false, nil
 				}
diff --git a/internal/tokens/fftokens/fftokens.go b/internal/tokens/fftokens/fftokens.go
@@ -806,7 +806,7 @@ func (ft *FFTokens) CreateTokenPool(ctx context.Context, nsOpID string, pool *co
 	if err != nil || !res.IsSuccess() {
 		return core.OpPhaseInitializing, wrapError(ctx, &errRes, res, err)
 	}
-	if res.StatusCode() == 200 {
+	if res.StatusCode() == http.StatusOK {
 		// HTTP 200: Creation was successful, and pool details are in response body
 		var obj fftypes.JSONObject
 		if err := json.Unmarshal(res.Body(), &obj); err != nil {
@@ -841,7 +841,7 @@ func (ft *FFTokens) ActivateTokenPool(ctx context.Context, pool *core.TokenPool)
 	if err != nil || !res.IsSuccess() {
 		return core.OpPhaseInitializing, err
 	}
-	if res.StatusCode() == 200 {
+	if res.StatusCode() == http.StatusOK {
 		// HTTP 200: Activation was successful, and pool details are in response body
 		var obj fftypes.JSONObject
 		if err := json.Unmarshal(res.Body(), &obj); err != nil {
@@ -851,7 +851,7 @@ func (ft *FFTokens) ActivateTokenPool(ctx context.Context, pool *core.TokenPool)
 			TX:     pool.TX.ID,
 			TXType: pool.TX.Type,
 		})
-	} else if res.StatusCode() == 204 {
+	} else if res.StatusCode() == http.StatusNoContent {
 		// HTTP 204: Activation was successful, but pool details are not available
 		// This will resolve the operation, but connector is responsible for re-delivering pool details on the websocket.
 		return core.OpPhaseComplete, nil
@@ -871,7 +871,7 @@ func (ft *FFTokens) DeactivateTokenPool(ctx context.Context, pool *core.TokenPoo
 		}).
 		SetError(&errRes).
 		Post("/api/v1/deactivatepool")
-	if err == nil && (res.IsSuccess() || res.StatusCode() == 404) {
+	if err == nil && (res.IsSuccess() || res.StatusCode() == http.StatusNotFound) {
 		return nil
 	}
 	return wrapError(ctx, &errRes, res, err)
diff --git a/test/e2e/client/restclient.go b/test/e2e/client/restclient.go
@@ -370,7 +370,7 @@ func (client *FireFlyClient) GetOrganization(t *testing.T, idOrName string) *cor
 		SetResult(&identity).
 		Get(client.namespaced(fmt.Sprintf("%s/%s", urlGetOrganizations, idOrName)))
 	assert.NoError(t, err)
-	if res.StatusCode() == 404 {
+	if res.StatusCode() == http.StatusNotFound {
 		return nil
 	}
 	assert.True(t, res.IsSuccess())
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
@@ -19,6 +19,7 @@ package e2e
 import (
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -63,7 +64,7 @@ func PollForUp(t *testing.T, client *client.FireFlyClient) {
 	var err error
 	for i := 0; i < 12; i++ {
 		_, resp, err = client.GetStatus()
-		if err == nil && resp.StatusCode() == 200 {
+		if err == nil && resp.StatusCode() == http.StatusOK {
 			break
 		}
 		time.Sleep(5 * time.Second)
