Move DB logic to firefly-common impl

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/golang-migrate/migrate/v4 v4.15.2
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
-	github.com/hyperledger/firefly-common v1.1.4
+	github.com/hyperledger/firefly-common v1.1.5
 	github.com/hyperledger/firefly-signer v1.1.2
 	github.com/jarcoal/httpmock v1.2.0
 	github.com/karlseguin/ccache v2.0.3+incompatible

go.sum

@@ -675,8 +675,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hyperledger/firefly-common v1.1.4 h1:7Oqe7FFOSjt8Uo3/i/ujD4wke2kD2Xr2Kouq4QmgWns=
-github.com/hyperledger/firefly-common v1.1.4/go.mod h1:taWRM7vsramcM7iWjeOmIgm3yd+RoWvaXSWxZKpSXM8=
+github.com/hyperledger/firefly-common v1.1.5 h1:yVOsUqZQoV/iCc/PxYFGdq/438JDdR/TdlCpMOv3XvM=
+github.com/hyperledger/firefly-common v1.1.5/go.mod h1:3ubN46/dB+xurCPvdfqMKjB/CJU3I/DsfOoS7dY2SyQ=
 github.com/hyperledger/firefly-signer v1.1.2 h1:QuS3M5w9px3BnPa4jIWMDg+z2ySK76MoO5Egh0G+tFg=
 github.com/hyperledger/firefly-signer v1.1.2/go.mod h1:4h2MN910A2knrWGYCT+aWjBDlhptgQn/9WcT1N/Ct8s=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=

internal/apiserver/ffi2swagger.go

@@ -32,7 +32,6 @@ import (
 	"github.com/hyperledger/firefly/internal/coreconfig"
 	"github.com/hyperledger/firefly/internal/coremsgs"
 	"github.com/hyperledger/firefly/pkg/core"
-	"github.com/hyperledger/firefly/pkg/database"
 )
 
 type FFISwaggerGen interface {
@@ -151,9 +150,6 @@ func (og *ffiSwaggerGen) addEvent(routes []*ffapi.Route, event *fftypes.FFIEvent
 		JSONInputValue:  nil,
 		JSONOutputValue: func() interface{} { return []*core.ContractListener{} },
 		JSONOutputCodes: []int{http.StatusOK},
-		Extensions: &coreExtensions{
-			FilterFactory: database.ContractListenerQueryFactory,
-		},
 	})
 	return routes
 }