Fix backport merge issues

Signed-off-by: Nicko Guyer <nicko.guyer@kaleido.io>

.golangci.yml

@@ -1,28 +1,33 @@
 run:
   tests: false
   skip-dirs:
-  - "mocks"
+    - "mocks"
+    - "ffconfig"
 linters-settings:
   golint: {}
   gocritic:
     enabled-checks: []
     disabled-checks:
       - regexpMust
+  revive:
+    rules:
+      - name: unused-parameter
+        disabled: true
   goheader:
     values:
       regexp:
         COMPANY: .*
     template: |-
       Copyright © {{ YEAR }} {{ COMPANY }}
-      
+
       SPDX-License-Identifier: Apache-2.0
-      
+
       Licensed under the Apache License, Version 2.0 (the "License");
       you may not use this file except in compliance with the License.
       You may obtain a copy of the License at
-      
+
           http://www.apache.org/licenses/LICENSE-2.0
-      
+
       Unless required by applicable law or agreed to in writing, software
       distributed under the License is distributed on an "AS IS" BASIS,
       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,7 +38,6 @@ linters:
   disable:
     - structcheck
   enable:
-    - depguard
     - dogsled
     - errcheck
     - goconst

Makefile

@@ -14,7 +14,7 @@ GOGC=30
 
 all: build test go-mod-tidy
 test: deps lint
-		$(VGO) test ./internal/... ./pkg/... ./cmd/... ./docs ./ffconfig/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s
+		$(VGO) test ./internal/... ./pkg/... ./cmd/... ./docs ./ffconfig/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s ${TEST_ARGS}
 coverage.html:
 		$(VGO) tool cover -html=coverage.txt
 coverage: test coverage.html
@@ -104,4 +104,4 @@ docker:
 docker-multiarch:
 		./docker_build.sh --platform linux/amd64,linux/arm64 $(DOCKER_ARGS) 
 docs: .ALWAYS
-		cd docs && bundle install && bundle exec jekyll build && bundle exec htmlproofer --disable-external --allow-hash-href --allow_missing_href true --swap-urls '^/firefly/:/' --ignore-urls /127.0.0.1/,/localhost/ ./_site
+		cd docs && bundle install && bundle exec jekyll build && bundle exec htmlproofer --disable-external --allow-hash-href --allow_missing_href true --swap-urls '^/firefly/:/' --ignore-urls /127.0.0.1/,/localhost/ ./_site

go.mod

@@ -1,6 +1,6 @@
 module github.com/hyperledger/firefly
 
-go 1.18
+go 1.19
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.0

test/e2e/client/restclient.go

@@ -836,8 +836,8 @@ func (client *FireFlyClient) GenerateFFIFromABI(t *testing.T, req *fftypes.FFIGe
 	return &res
 }
 
-func (client *FireFlyClient) CreateFFI(t *testing.T, ffi *fftypes.FFI) (interface{}, error) {
-	var res interface{}
+func (client *FireFlyClient) CreateFFI(t *testing.T, ffi *fftypes.FFI) (*fftypes.FFI, error) {
+	var res fftypes.FFI
 	path := client.namespaced(urlContractInterface)
 	resp, err := client.Client.R().
 		SetBody(ffi).
@@ -846,7 +846,7 @@ func (client *FireFlyClient) CreateFFI(t *testing.T, ffi *fftypes.FFI) (interfac
 		Post(path)
 	require.NoError(t, err)
 	require.Equal(t, 200, resp.StatusCode(), "POST %s [%d]: %s", path, resp.StatusCode(), resp.String())
-	return res, err
+	return &res, err
 }
 
 func (client *FireFlyClient) CreateContractAPI(t *testing.T, name string, ffiReference *fftypes.FFIReference, location *fftypes.JSONAny) (interface{}, error) {

test/e2e/gateway/ethereum_coupon.go

@@ -235,7 +235,7 @@ func (suite *EthereumCouponTestSuite) SetupSuite() {
 	suite.contractAddress = deployCouponContract(suite.T(), stack.Name, "coupon/coupon.json", suite.ethIdentity)
 
 	res, err := suite.testState.client1.CreateFFI(suite.T(), couponFFI())
-	suite.interfaceID = fftypes.MustParseUUID(res.(map[string]interface{})["id"].(string))
+	suite.interfaceID = res.ID
 	suite.T().Logf("interfaceID: %s", suite.interfaceID)
 	assert.NoError(suite.T(), err)
 }

test/e2e/gateway/ethereum_simplestorage.go

@@ -125,7 +125,7 @@ func (suite *EthereumSimpleStorageTestSuite) SetupSuite() {
 	suite.contractAddress = deploySimpleStorageContract(suite.T(), stack.Name, "simplestorage/simple_storage.json")
 
 	res, err := suite.testState.client1.CreateFFI(suite.T(), simpleStorageFFI())
-	suite.interfaceID = fftypes.MustParseUUID(res.(map[string]interface{})["id"].(string))
+	suite.interfaceID = res.ID
 	suite.T().Logf("interfaceID: %s", suite.interfaceID)
 	assert.NoError(suite.T(), err)
 }

test/e2e/multiparty/ethereum_contracts.go

@@ -125,7 +125,7 @@ func (suite *EthereumContractTestSuite) SetupSuite() {
 	suite.contractAddress = deployContract(suite.T(), stack.Name, "simplestorage/simple_storage.json")
 
 	res, err := suite.testState.client1.CreateFFI(suite.T(), simpleStorageFFI())
-	suite.interfaceID = fftypes.MustParseUUID(res.(map[string]interface{})["id"].(string))
+	suite.interfaceID = res.ID
 	suite.T().Logf("interfaceID: %s", suite.interfaceID)
 	assert.NoError(suite.T(), err)
 }