Use fresh error codes for cardano errors

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

Author: SupernaviX

internal/blockchain/cardano/cardano_test.go

@@ -222,7 +222,7 @@ func TestStartNamespaceStreamQueryError(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = c.StartNamespace(c.ctx, "ns1")
-	assert.Regexp(t, "FF10282.*pop", err)
+	assert.Regexp(t, "FF10484.*pop", err)
 }
 
 func TestStartNamespaceStreamCreateError(t *testing.T) {
@@ -248,7 +248,7 @@ func TestStartNamespaceStreamCreateError(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = c.StartNamespace(c.ctx, "ns1")
-	assert.Regexp(t, "FF10282.*pop", err)
+	assert.Regexp(t, "FF10484.*pop", err)
 }
 
 func TestStartNamespaceStreamUpdateError(t *testing.T) {
@@ -274,7 +274,7 @@ func TestStartNamespaceStreamUpdateError(t *testing.T) {
 	assert.NoError(t, err)
 
 	err = c.StartNamespace(c.ctx, "ns1")
-	assert.Regexp(t, "FF10282.*pop", err)
+	assert.Regexp(t, "FF10484.*pop", err)
 }
 
 func TestStartNamespaceWSConnectFail(t *testing.T) {
@@ -359,7 +359,7 @@ func TestVerifyCardanoAddress(t *testing.T) {
 	assert.Regexp(t, "FF10354", err)
 
 	_, err = c.ResolveSigningKey(context.Background(), "baddr1cafed00d", blockchain.ResolveKeyIntentSign)
-	assert.Regexp(t, "FF10140", err)
+	assert.Regexp(t, "FF10483", err)
 
 	key, err := c.ResolveSigningKey(context.Background(), "addr1qx2fxv2umyhttkxyxp8x0dlpdt3k6cwng5pxj3jhsydzer3n0d3vllmyqwsx5wktcd8cc3sq835lu7drv2xwl2wywfgse35a3x", blockchain.ResolveKeyIntentSign)
 	assert.NoError(t, err)
@@ -868,7 +868,7 @@ func TestDeleteContractListenerFail(t *testing.T) {
 		httpmock.NewStringResponder(500, "oops"))
 
 	err := c.DeleteContractListener(context.Background(), sub, true)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestGetContractListenerStatus(t *testing.T) {
@@ -917,7 +917,7 @@ func TestGetContractListenerErrorNotFound(t *testing.T) {
 		httpmock.NewStringResponder(404, "no"))
 
 	_, _, _, err := c.GetContractListenerStatus(context.Background(), "ns1", "sb-1", false)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestGetTransactionStatusSuccess(t *testing.T) {
@@ -1062,7 +1062,7 @@ func TestGetTransactionStatusError(t *testing.T) {
 		httpmock.NewStringResponder(500, "uh oh"))
 
 	_, err := c.GetTransactionStatus(context.Background(), op)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestGetTransactionStatusHandleReceipt(t *testing.T) {
@@ -1226,7 +1226,7 @@ func TestAddFireflySubscriptionListError(t *testing.T) {
 
 	ns := &core.Namespace{Name: "ns1", NetworkName: "ns1"}
 	_, err = c.AddFireflySubscription(c.ctx, ns, contract, "")
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestAddFireflySubscriptionAlreadyExists(t *testing.T) {
@@ -1326,7 +1326,7 @@ func TestAddFireflySubscriptionCreateError(t *testing.T) {
 
 	ns := &core.Namespace{Name: "ns1", NetworkName: "ns1"}
 	_, err = c.AddFireflySubscription(c.ctx, ns, contract, "")
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestInvokeContractOK(t *testing.T) {
@@ -1456,7 +1456,7 @@ func TestInvokeContractConnectorError(t *testing.T) {
 
 	rejected, err := c.InvokeContract(context.Background(), "opId", signingKey, fftypes.JSONAnyPtrBytes(locationBytes), parsedMethod, params, options, nil)
 	assert.True(t, rejected)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestQueryContractOK(t *testing.T) {
@@ -1587,7 +1587,7 @@ func TestQueryContractConnectorError(t *testing.T) {
 	assert.NoError(t, err)
 
 	_, err = c.QueryContract(context.Background(), signingKey, fftypes.JSONAnyPtrBytes(locationBytes), parsedMethod, params, options)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestQueryContractInvalidJson(t *testing.T) {
@@ -1653,7 +1653,7 @@ func TestDeployContractConnectorError(t *testing.T) {
 
 	rejected, err := c.DeployContract(context.Background(), nsOpId, signingKey, definition, contract, nil, nil)
 	assert.True(t, rejected)
-	assert.Regexp(t, "FF10282", err)
+	assert.Regexp(t, "FF10484", err)
 }
 
 func TestGetFFIParamValidator(t *testing.T) {

internal/coremsgs/en_error_messages.go

@@ -59,7 +59,6 @@ var (
 	MsgSerializationFailed                     = ffe("FF10137", "Serialization failed")
 	MsgMissingPluginConfig                     = ffe("FF10138", "Missing configuration '%s' for %s")
 	MsgMissingDataHashIndex                    = ffe("FF10139", "Missing data hash for index '%d' in message", 400)
-	MsgInvalidCardanoAddress                   = ffe("FF10140", "Supplied cardano address is invalid", 400)
 	MsgInvalidEthAddress                       = ffe("FF10141", "Supplied ethereum address is invalid", 400)
 	MsgInvalidTezosAddress                     = ffe("FF10142", "Supplied tezos address is invalid", 400)
 	Msg404NoResult                             = ffe("FF10143", "No result found", 404)
@@ -147,7 +146,6 @@ var (
 	MsgAuthorOrgSigningKeyMismatch             = ffe("FF10279", "Author organization '%s' is not associated with signing key '%s'")
 	MsgCannotTransferToSelf                    = ffe("FF10280", "From and to addresses must be different", 400)
 	MsgLocalOrgNotSet                          = ffe("FF10281", "Unable to resolve the local root org. Please ensure org.name is configured", 500)
-	MsgCardanoconnectRESTErr                   = ffe("FF10282", "Error from cardano connector: %s")
 	MsgTezosconnectRESTErr                     = ffe("FF10283", "Error from tezos connector: %s")
 	MsgFabconnectRESTErr                       = ffe("FF10284", "Error from fabconnect: %s")
 	MsgInvalidIdentity                         = ffe("FF10285", "Supplied Fabric signer identity is invalid", 400)
@@ -323,4 +321,6 @@ var (
 	MsgInvalidIdentityPatch                    = ffe("FF10480", "A profile must be provided when updating an identity", 400)
 	MsgNodeNotProvidedForCheck                 = ffe("FF10481", "Node not provided for check", 500)
 	MsgNodeMissingProfile                      = ffe("FF10482", "Node provided for check does not have a profile", 500)
+	MsgInvalidCardanoAddress                   = ffe("FF10483", "Supplied cardano address is invalid", 400)
+	MsgCardanoconnectRESTErr                   = ffe("FF10484", "Error from cardano connector: %s")
 )