Fixes for multiple filters

Signed-off-by: Nicko Guyer <[email protected]>

db/migrations/postgres/000116_update_contractlisteners_add_filters_column.down.sql → db/migrations/postgres/000117_update_contractlisteners_add_filters_column.down.sql

@@ -1,5 +1,5 @@
 BEGIN;
 ALTER TABLE contractlisteners DROP COLUMN filters;
-ALTER TABLE contractlisteners DROP COLUMN filter_hash;
 DROP INDEX contractlisteners_filter_hash;
+ALTER TABLE contractlisteners DROP COLUMN filter_hash;
 COMMIT;

db/migrations/sqlite/000116_update_contractlisteners_add_filters_column.down.sql → db/migrations/sqlite/000117_update_contractlisteners_add_filters_column.down.sql

@@ -1,3 +1,3 @@
 ALTER TABLE contractlisteners DROP COLUMN filters;
-ALTER TABLE contractlisteners DROP COLUMN filter_hash;
 DROP INDEX contractlisteners_filter_hash;
+ALTER TABLE contractlisteners DROP COLUMN filter_hash;

db/migrations/sqlite/000116_update_contractlisteners_add_filters_column.up.sql → db/migrations/sqlite/000117_update_contractlisteners_add_filters_column.up.sql

@@ -1,4 +1,6 @@
 ALTER TABLE contractlisteners ADD COLUMN filters TEXT;
+ALTER TABLE contractlisteners ADD COLUMN filter_hash CHAR(64);
+CREATE INDEX contractlisteners_filter_hash ON contractlisteners(filter_hash);
 
 -- SQLite doesn't support dropping NOT NULL constraints so we have to move
 -- everything to a temp colum, create a new column, then copy the data back
@@ -10,6 +12,3 @@ UPDATE contractlisteners SET event = event_tmp;
 UPDATE contractlisteners SET location = location_tmp;
 ALTER TABLE contractlisteners DROP COLUMN event_tmp;
 ALTER TABLE contractlisteners DROP COLUMN location_tmp;
-
-ALTER TABLE contractlisteners ADD COLUMN filter_hash CHAR(64);
-CREATE INDEX contractlisteners_filter_hash ON contractlisteners(filter_hash);

internal/blockchain/ethereum/ethereum_test.go

@@ -2065,7 +2065,7 @@ func TestAddSubscriptionMultipleFilters(t *testing.T) {
 	defer cancel()
 	httpmock.ActivateNonDefault(e.client.GetClient())
 	defer httpmock.DeactivateAndReset()
-	e.streamID = "es-1"
+	e.streamID["ns1"] = "es-1"
 	e.streams = &streamManager{
 		client: e.client,
 	}
@@ -2118,7 +2118,7 @@ func TestAddSubscriptionInvalidAbi(t *testing.T) {
 	defer cancel()
 	httpmock.ActivateNonDefault(e.client.GetClient())
 	defer httpmock.DeactivateAndReset()
-	e.streamID = "es-1"
+	e.streamID["ns1"] = "es-1"
 	e.streams = &streamManager{
 		client: e.client,
 	}
@@ -2214,7 +2214,7 @@ func TestAddSubscriptionBadLocation(t *testing.T) {
 	httpmock.ActivateNonDefault(e.client.GetClient())
 	defer httpmock.DeactivateAndReset()
 
-	e.streamID = "es-1"
+	e.streamID["ns1"] = "es-1"
 	e.streams = &streamManager{
 		client: e.client,
 	}

internal/blockchain/ethereum/eventstream.go

@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //

internal/contracts/manager_test.go

@@ -1235,10 +1235,10 @@ func TestAddContractListenerNameConflict(t *testing.T) {
 	}
 
 	mbi.On("NormalizeContractLocation", context.Background(), blockchain.NormalizeListener, sub.Location).Return(sub.Location, nil)
-	mdi.On("GetContractListener", context.Background(), "ns1", "sub1").Return(&core.ContractListener{}, nil)
+	// mdi.On("GetContractListener", context.Background(), "ns1", "sub1").Return(&core.ContractListener{}, nil)
 
 	_, err := cm.AddContractListener(context.Background(), sub)
-	assert.Regexp(t, "FF10312", err)
+	assert.Regexp(t, "FF10317", err)
 
 	mbi.AssertExpectations(t)
 	mdi.AssertExpectations(t)
@@ -1249,6 +1249,8 @@ func TestAddContractListenerNameError(t *testing.T) {
 	mbi := cm.blockchain.(*blockchainmocks.Plugin)
 	mdi := cm.database.(*databasemocks.Plugin)
 
+	ffiID := fftypes.NewUUID()
+
 	sub := &core.ContractListenerInput{
 		ContractListener: core.ContractListener{
 			Name: "sub1",
@@ -1257,9 +1259,25 @@ func TestAddContractListenerNameError(t *testing.T) {
 			}.String()),
 			Topic: "test-topic",
 		},
-		EventPath: "changed",
+		Filters: core.ListenerFiltersInput{
+			&core.ListenerFilterInput{
+				ListenerFilter: core.ListenerFilter{
+					Interface: &fftypes.FFIReference{
+						ID: ffiID,
+					},
+				},
+				EventPath: "set",
+			},
+		},
 	}
 
+	mdi.On("GetFFIByID", context.Background(), "ns1", ffiID).Return(&fftypes.FFI{}, nil)
+	mdi.On("GetFFIEvent", context.Background(), "ns1", ffiID, "set").Return(&fftypes.FFIEvent{
+		FFIEventDefinition: fftypes.FFIEventDefinition{
+			Name: "eventName",
+		},
+	}, nil)
+	mbi.On("GenerateEventSignature", context.Background(), mock.Anything).Return("eventSignature")
 	mbi.On("NormalizeContractLocation", context.Background(), blockchain.NormalizeListener, sub.Location).Return(sub.Location, nil)
 	mdi.On("GetContractListener", context.Background(), "ns1", "sub1").Return(nil, fmt.Errorf("pop"))