Update interface to split sign/sign-direct

Signed-off-by: Peter Broadhurst <[email protected]>

Makefile

@@ -30,10 +30,11 @@ mocks-$(strip $(1))-$(strip $(2)): ${MOCKERY}
 	${MOCKERY} --case underscore --dir $(1) --name $(2) --outpkg $(3) --output mocks/$(strip $(3))
 endef
 
-$(eval $(call makemock, pkg/ethsigner,       Wallet,  ethsignermocks))
-$(eval $(call makemock, pkg/secp256k1,       Signer,  secp256k1mocks))
-$(eval $(call makemock, internal/rpcserver,  Server,  rpcservermocks))
-$(eval $(call makemock, pkg/rpcbackend,      Backend, rpcbackendmocks))
+$(eval $(call makemock, pkg/ethsigner,       Wallet,       ethsignermocks))
+$(eval $(call makemock, pkg/secp256k1,       Signer,       secp256k1mocks))
+$(eval $(call makemock, pkg/secp256k1,       SignerDirect, secp256k1mocks))
+$(eval $(call makemock, internal/rpcserver,  Server,       rpcservermocks))
+$(eval $(call makemock, pkg/rpcbackend,      Backend,      rpcbackendmocks))
 
 firefly-signer: ${GOFILES}
 		$(VGO) build -o ./firefly-signer -ldflags "-X main.buildDate=`date -u +\"%Y-%m-%dT%H:%M:%SZ\"` -X main.buildVersion=$(BUILD_VERSION)" -tags=prod -tags=prod -v ./ffsigner 

pkg/ethsigner/typed_data.go

@@ -32,7 +32,7 @@ type EIP712Result struct {
 	S         ethtypes.HexBytes0xPrefix `ffstruct:"EIP712Result" json:"s"`
 }
 
-func SignTypedDataV4(ctx context.Context, signer secp256k1.Signer, payload *eip712.TypedData) (*EIP712Result, error) {
+func SignTypedDataV4(ctx context.Context, signer secp256k1.SignerDirect, payload *eip712.TypedData) (*EIP712Result, error) {
 	encodedData, err := eip712.EncodeTypedDataV4(ctx, payload)
 	if err != nil {
 		return nil, err

pkg/ethsigner/typed_data_test.go

@@ -92,7 +92,7 @@ func TestSignTypedDataV4SignFail(t *testing.T) {
 		PrimaryType: eip712.EIP712Domain,
 	}
 
-	msn := &secp256k1mocks.Signer{}
+	msn := &secp256k1mocks.SignerDirect{}
 	msn.On("SignDirect", mock.Anything).Return(nil, fmt.Errorf("pop"))
 
 	ctx := context.Background()

pkg/secp256k1/signer.go

@@ -34,6 +34,9 @@ type SignatureData struct {
 // Signer is the low level common interface that can be implemented by any module which provides signature capability
 type Signer interface {
 	Sign(message []byte) (*SignatureData, error)
+}
+
+type SignerDirect interface {
 	SignDirect(message []byte) (*SignatureData, error)
 }