More tests update

Signed-off-by: Enrique Lacal <enrique.lacal@kaleido.io>

Author: EnriqueL8

internal/blockchain/common/common_test.go

@@ -466,21 +466,21 @@ func TestCallbackBulkOperationUpdate(t *testing.T) {
 	cb.SetOperationalHandler("ns1", mcb)
 
 	mbi.On("Name").Return("utblockchain")
-	mcb.On("BulkOperationUpdates", mock.MatchedBy(func(updates []*core.OperationUpdate) bool {
+	mcb.On("BulkOperationUpdates", mock.Anything, mock.MatchedBy(func(updates []*core.OperationUpdate) bool {
 		assert.True(t, updates[0].NamespacedOpID == nsOpID &&
 			updates[0].Status == core.OpStatusSucceeded &&
 			updates[0].BlockchainTXID == "tx1" &&
 			updates[0].ErrorMessage == "err" &&
 			updates[0].Plugin == "utblockchain")
 
-		assert.True(t, updates[1].NamespacedOpID == nsOpID &&
+		assert.True(t, updates[1].NamespacedOpID == nsOpID2 &&
 			updates[1].Status == core.OpStatusSucceeded &&
-			updates[1].BlockchainTXID == "tx1" &&
+			updates[1].BlockchainTXID == "tx2" &&
 			updates[1].ErrorMessage == "err" &&
 			updates[1].Plugin == "utblockchain")
 
 		return true
-	})).Return().Once()
+	})).Return(nil).Once()
 
 	cb.BulkOperationUpdates(context.Background(), "ns1", []*core.OperationUpdate{
 		{
@@ -489,13 +489,15 @@ func TestCallbackBulkOperationUpdate(t *testing.T) {
 			BlockchainTXID: "tx1",
 			ErrorMessage:   "err",
 			Output:         fftypes.JSONObject{},
+			Plugin:         "utblockchain",
 		},
 		{
 			NamespacedOpID: nsOpID2,
 			Status:         core.OpStatusSucceeded,
 			BlockchainTXID: "tx2",
 			ErrorMessage:   "err",
 			Output:         fftypes.JSONObject{},
+			Plugin:         "utblockchain",
 		},
 	})
 

internal/operations/manager_test.go

@@ -813,6 +813,7 @@ func TestSubmitBulkOperationUpdatesIgnoredUpdate(t *testing.T) {
 		NamespacedOpID: "different-namespace:" + opID.String(),
 		Status:         core.OpStatusSucceeded,
 		ErrorMessage:   "my-error-message",
+		Plugin:         "blockchain",
 	}
 
 	err := om.SubmitBulkOperationUpdates(ctx, []*core.OperationUpdate{submittedUpdate})
@@ -833,6 +834,7 @@ func TestSubmitBulkOperationUpdatesIgnoredBadID(t *testing.T) {
 		NamespacedOpID: "ns1:BAD-UUID",
 		Status:         core.OpStatusSucceeded,
 		ErrorMessage:   "my-error-message",
+		Plugin:         "blockchain",
 	}
 
 	err := om.SubmitBulkOperationUpdates(ctx, []*core.OperationUpdate{submittedUpdate})
@@ -863,6 +865,7 @@ func TestSubmitBulkOperationUpdatesError(t *testing.T) {
 		NamespacedOpID: "ns1:" + opID.String(),
 		Status:         core.OpStatusSucceeded,
 		ErrorMessage:   "my-error-message",
+		Plugin:         "blockchain",
 	}
 
 	mdi := om.database.(*databasemocks.Plugin)