From 97540f9ded30f68f9fda62f66f3006414cbfd5b7 Mon Sep 17 00:00:00 2001 From: Rasmus Dahlberg Date: Sat, 21 May 2022 20:31:09 +0200 Subject: move mock signer to internal/ --- pkg/types/crypto_test.go | 15 --------------- pkg/types/leaf_test.go | 6 ++++-- pkg/types/tree_head_test.go | 5 +++-- 3 files changed, 7 insertions(+), 19 deletions(-) (limited to 'pkg/types') diff --git a/pkg/types/crypto_test.go b/pkg/types/crypto_test.go index d95d5fa..181c8f0 100644 --- a/pkg/types/crypto_test.go +++ b/pkg/types/crypto_test.go @@ -4,24 +4,9 @@ import ( "crypto" "crypto/ed25519" "crypto/rand" - "io" "testing" ) -type testSigner struct { - PublicKey PublicKey - Signature Signature - Error error -} - -func (ts *testSigner) Public() crypto.PublicKey { - return ed25519.PublicKey(ts.PublicKey[:]) -} - -func (ts *testSigner) Sign(rand io.Reader, digest []byte, opts crypto.SignerOpts) ([]byte, error) { - return ts.Signature[:], ts.Error -} - func newKeyPair(t *testing.T) (crypto.Signer, PublicKey) { vk, sk, err := ed25519.GenerateKey(rand.Reader) if err != nil { diff --git a/pkg/types/leaf_test.go b/pkg/types/leaf_test.go index 645f49e..9eae13c 100644 --- a/pkg/types/leaf_test.go +++ b/pkg/types/leaf_test.go @@ -8,6 +8,8 @@ import ( "reflect" "strings" "testing" + + "git.sigsum.org/sigsum-go/internal/mocks/signer" ) func TestStatementToBinary(t *testing.T) { @@ -28,13 +30,13 @@ func TestStatementSign(t *testing.T) { { desc: "invalid: signer error", stm: validStatement(t), - signer: &testSigner{*newPubBufferInc(t), *newSigBufferInc(t), fmt.Errorf("signing error")}, + signer: &signer.Signer{newPubBufferInc(t)[:], newSigBufferInc(t)[:], fmt.Errorf("signing error")}, wantErr: true, }, { desc: "valid", stm: validStatement(t), - signer: &testSigner{*newPubBufferInc(t), *newSigBufferInc(t), nil}, + signer: &signer.Signer{newPubBufferInc(t)[:], newSigBufferInc(t)[:], nil}, wantSig: newSigBufferInc(t), }, } { diff --git a/pkg/types/tree_head_test.go b/pkg/types/tree_head_test.go index a1ffa6f..aa57a1c 100644 --- a/pkg/types/tree_head_test.go +++ b/pkg/types/tree_head_test.go @@ -8,6 +8,7 @@ import ( "reflect" "testing" + "git.sigsum.org/sigsum-go/internal/mocks/signer" "git.sigsum.org/sigsum-go/pkg/hex" ) @@ -30,13 +31,13 @@ func TestTreeHeadSign(t *testing.T) { { desc: "invalid: signer error", th: validTreeHead(t), - signer: &testSigner{*newPubBufferInc(t), *newSigBufferInc(t), fmt.Errorf("signing error")}, + signer: &signer.Signer{newPubBufferInc(t)[:], newSigBufferInc(t)[:], fmt.Errorf("signing error")}, wantErr: true, }, { desc: "valid", th: validTreeHead(t), - signer: &testSigner{*newPubBufferInc(t), *newSigBufferInc(t), nil}, + signer: &signer.Signer{newPubBufferInc(t)[:], newSigBufferInc(t)[:], nil}, wantSig: newSigBufferInc(t), }, } { -- cgit v1.2.3