Merge pull request #216 from kaleido-io/ffcommon

Replace dep on fftm+core with new firefly-common package

.vscode/settings.json

@@ -4,6 +4,8 @@
     "ABIID",
     "Debugf",
     "ffcapi",
+    "ffcapiconnector",
+    "ffcapiconnectormocks",
     "ffcmocks",
     "fftypes",
     "hashicorp",

Makefile

@@ -64,7 +64,7 @@ endef
 $(eval $(call makemock, internal/contractregistry, ContractStore,        contractregistrymocks))
 $(eval $(call makemock, internal/contractregistry, RemoteRegistry,       contractregistrymocks))
 $(eval $(call makemock, internal/eth,              RPCClient,            ethmocks))
-$(eval $(call makemock, internal/ffc,              FFCServer,            ffcmocks))
+$(eval $(call makemock, internal/ffcapiconnector,  FFCServer,            ffcapiconnectormocks))
 $(eval $(call makemock, $$(SARAMA_PATH),           Client,               saramamocks))
 $(eval $(call makemock, $$(SARAMA_PATH),           ConsumerGroup,        saramamocks))
 $(eval $(call makemock, $$(SARAMA_PATH),           ConsumerGroupSession, saramamocks))

README.md

@@ -21,7 +21,7 @@ The connectors themselves are highly pluggable, and easy to build for a new
 blockchain ecosystem. The first reference implementation of the FireFly Connector API (FFCAPI)
 is provided in this repo:
 
-- See the [internal/ffc](./internal/ffc) folder for that implementation
+- See the [internal/ffcapiconnector](./internal/ffcapiconnector) folder for that implementation
 
 > A separate trimmed-down repository containing just a reference FFCAPI connector
 > for EVM-based blockchain networks is a roadmap item for the Hyperledger FireFly community.

go.mod

@@ -15,8 +15,7 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
-	github.com/hyperledger/firefly v1.0.0-rc.4.0.20220420070806-f5b009100566
-	github.com/hyperledger/firefly-transaction-manager v0.0.0-20220427021621-501ab78134f1
+	github.com/hyperledger/firefly-common v0.1.2
 	github.com/icza/dyno v0.0.0-20210726202311-f1bafe5d9996
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/kaleido-io/ethbinding v0.0.0-20220405144420-999853435d9e

go.sum

@@ -667,6 +667,7 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210715191844-86eeefc3e471/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -768,28 +769,10 @@ github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.3-0.20220313090229-ca81a64b4204/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
-github.com/hyperledger/firefly v1.0.0-rc.4.0.20220419045021-4e8daade6f4d h1:+arnJUkOhynylO7qN6Q/FW3i6/KrPvUxELXHbaCxzTk=
-github.com/hyperledger/firefly v1.0.0-rc.4.0.20220419045021-4e8daade6f4d/go.mod h1:ZQtNj2FjfqK2UdQWiQphDewGbLWMhx+G98XYALKzPy0=
-github.com/hyperledger/firefly v1.0.0-rc.4.0.20220420070806-f5b009100566 h1:6tOa8bPhKCc/XuUZ2gPpdjVd7fCUvJ3gHjuiESuoI40=
-github.com/hyperledger/firefly v1.0.0-rc.4.0.20220420070806-f5b009100566/go.mod h1:ZQtNj2FjfqK2UdQWiQphDewGbLWMhx+G98XYALKzPy0=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420015900-14381b038ab4 h1:0yAJinGBFlqA+132rWdnV9V3teuy0+us3ldHnWSZuLE=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420015900-14381b038ab4/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420033036-ee425bbc0d3c h1:ex4j0qxE9Fmk4Tr4Dv+qUNYcyHqyS4SwH0OqxGfQY1U=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420033036-ee425bbc0d3c/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420033818-96364b956af5 h1:ehZ/PW4iwDA1W6ntqyqnVHw4dA08iq0+yY5n9UBcK8s=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420033818-96364b956af5/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420034356-f84a6feac4e9 h1:QiYqu1d2IIuTOCy3OgDHroQPzJIKi4vdtIlhqEmD2I8=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420034356-f84a6feac4e9/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420042349-f00f9a0ecb4e h1:Pwn/zWqPjBETymhpvaBSNMqFwnrkSnTR3bgjo9drnJg=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420042349-f00f9a0ecb4e/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420042453-d821a32b524b h1:5RV6BlcyIaYt2J5FLY0JcfVBoWiSFvIyZduE0Jzlmi8=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220420042453-d821a32b524b/go.mod h1:bdRmuFqbKbpghA8MkLdGq2Qn7Ob9y/FiO+L/w34DRBk=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220422223848-b32fe362d406 h1:8X5TCz0V84KPfd1ltt+lvJxAdtaZkwTb+G7iUtwZpqc=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220422223848-b32fe362d406/go.mod h1:o4GvZwkgMqR+Eod8xKH7y0H2nNZz+hA2tshbrqc7uf8=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220426174359-05291b07ed70 h1:0bjQq1mg7Yntd6XhknhjbJ3yUbT/GjjVUkWNPtZIxhY=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220426174359-05291b07ed70/go.mod h1:o4GvZwkgMqR+Eod8xKH7y0H2nNZz+hA2tshbrqc7uf8=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220427021621-501ab78134f1 h1:35o7r9XkAQPWQeW88yanmiVQPR4UUh4Dq3KmfTifGLY=
-github.com/hyperledger/firefly-transaction-manager v0.0.0-20220427021621-501ab78134f1/go.mod h1:o4GvZwkgMqR+Eod8xKH7y0H2nNZz+hA2tshbrqc7uf8=
+github.com/hyperledger/firefly-common v0.1.2-0.20220505012722-b17e8af423d7 h1:Cac5/8GU4FgqC6fLEOWatPT44p2wgxpbpDNMqmmHL7w=
+github.com/hyperledger/firefly-common v0.1.2-0.20220505012722-b17e8af423d7/go.mod h1:ytB+404+Qg00wJKx602Yi/V6Spx9d0g65lZR9y5fzlo=
+github.com/hyperledger/firefly-common v0.1.2 h1:zwz7WAHrK5we8bku7FO1rGZSFY+N4sDO3fWrabsnL+E=
+github.com/hyperledger/firefly-common v0.1.2/go.mod h1:ytB+404+Qg00wJKx602Yi/V6Spx9d0g65lZR9y5fzlo=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -1091,6 +1074,9 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.1/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
 github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -1101,6 +1087,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
 github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
@@ -1291,6 +1279,7 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8=
 github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -1564,6 +1553,7 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

internal/ffc/create_block_listener.go → internal/ffcapiconnector/create_block_listener.go

@@ -14,13 +14,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 )
 

internal/ffc/create_block_listener_test.go → internal/ffcapiconnector/create_block_listener_test.go

@@ -14,14 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/ffc/error_mapping.go → internal/ffcapiconnector/error_mapping.go

@@ -14,12 +14,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"strings"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 )
 
 type ethRPCMethodCategory int

internal/ffc/exec_query.go → internal/ffcapiconnector/exec_query.go

@@ -14,13 +14,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	"github.com/hyperledger/firefly-ethconnect/internal/errors"
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
 )
 
 func (s *ffcServer) execQuery(ctx context.Context, payload []byte) (interface{}, ffcapi.ErrorReason, error) {

internal/ffc/exec_query_test.go → internal/ffcapiconnector/exec_query_test.go

@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"

internal/ffc/get_block_info.go → internal/ffcapiconnector/get_block_info.go

@@ -14,15 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-ethconnect/internal/errors"
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
-	"github.com/hyperledger/firefly/pkg/fftypes"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 )
 

internal/ffc/get_block_info_test.go → internal/ffcapiconnector/get_block_info_test.go

@@ -14,15 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/ffc/get_gas_price.go → internal/ffcapiconnector/get_gas_price.go

@@ -14,15 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
-	"github.com/hyperledger/firefly/pkg/fftypes"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 )
 

internal/ffc/get_gas_price_test.go → internal/ffcapiconnector/get_gas_price_test.go

@@ -14,14 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/ffc/get_new_block_hashes.go → internal/ffcapiconnector/get_new_block_hashes.go

@@ -14,13 +14,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 )
 

internal/ffc/get_new_block_hashes_test.go → internal/ffcapiconnector/get_new_block_hashes_test.go

@@ -14,14 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/ffc/get_next_nonce.go → internal/ffcapiconnector/get_next_nonce.go

@@ -14,14 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
-	"github.com/hyperledger/firefly/pkg/fftypes"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 )
 

internal/ffc/get_next_nonce_test.go → internal/ffcapiconnector/get_next_nonce_test.go

@@ -14,14 +14,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

internal/ffc/get_receipt.go → internal/ffcapiconnector/get_receipt.go

@@ -14,16 +14,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-ethconnect/internal/errors"
 	"github.com/hyperledger/firefly-ethconnect/internal/eth"
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
-	"github.com/hyperledger/firefly/pkg/fftypes"
 )
 
 func (s *ffcServer) getReceipt(ctx context.Context, payload []byte) (interface{}, ffcapi.ErrorReason, error) {

internal/ffc/get_receipt_test.go → internal/ffcapiconnector/get_receipt_test.go

@@ -14,15 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"testing"
 
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

internal/ffc/prepare_transaction.go → internal/ffcapiconnector/prepare_transaction.go

@@ -14,18 +14,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package ffc
+package ffcapiconnector
 
 import (
 	"context"
 	"encoding/json"
 
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/hyperledger/firefly-common/pkg/ffcapi"
+	"github.com/hyperledger/firefly-common/pkg/fftypes"
 	"github.com/hyperledger/firefly-ethconnect/internal/errors"
 	"github.com/hyperledger/firefly-ethconnect/internal/eth"
 	"github.com/hyperledger/firefly-ethconnect/internal/messages"
-	"github.com/hyperledger/firefly-transaction-manager/pkg/ffcapi"
-	"github.com/hyperledger/firefly/pkg/fftypes"
 	ethbinding "github.com/kaleido-io/ethbinding/pkg"
 	log "github.com/sirupsen/logrus"
 )