From 26b786d9857db21fdf110eaf9cb6d1d6e4e68ef9 Mon Sep 17 00:00:00 2001
From: Rasmus Dahlberg <rasmus.dahlberg@kau.se>
Date: Mon, 13 Sep 2021 19:53:17 +0200
Subject: updated (co)signed tree head structures

- Added key_hash in tree head, see motivation in api.md
- Added separate types for (co)signed tree heads
- Refactored tree head HTTP APIs to be current, see api.md
---
 pkg/types/ascii_test.go | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

(limited to 'pkg/types/ascii_test.go')

diff --git a/pkg/types/ascii_test.go b/pkg/types/ascii_test.go
index c3f9e98..fc3f486 100644
--- a/pkg/types/ascii_test.go
+++ b/pkg/types/ascii_test.go
@@ -134,26 +134,14 @@ func TestSignedTreeHeadMarshalASCII(t *testing.T) {
 			TreeSize:  456,
 			RootHash:  testBuffer32,
 		},
-		SigIdent: []*SigIdent{
-			&SigIdent{
-				Signature: testBuffer64,
-				KeyHash:   testBuffer32,
-			},
-			&SigIdent{
-				Signature: testBuffer64,
-				KeyHash:   testBuffer32,
-			},
-		},
+		Signature: testBuffer64,
 	}
 	wantBuf := bytes.NewBufferString(fmt.Sprintf(
-		"%s%s%d%s"+"%s%s%d%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s",
+		"%s%s%d%s"+"%s%s%d%s"+"%s%s%x%s"+"%s%s%x%s",
 		Timestamp, Delim, 123, EOL,
 		TreeSize, Delim, 456, EOL,
 		RootHash, Delim, testBuffer32[:], EOL,
 		Signature, Delim, testBuffer64[:], EOL,
-		KeyHash, Delim, testBuffer32[:], EOL,
-		Signature, Delim, testBuffer64[:], EOL,
-		KeyHash, Delim, testBuffer32[:], EOL,
 	))
 	buf := bytes.NewBuffer(nil)
 	if err := sth.MarshalASCII(buf); err != nil {
@@ -236,14 +224,11 @@ func TestSignedTreeHeadUnmarshalASCII(t *testing.T) {
 		{
 			description: "valid",
 			buf: bytes.NewBufferString(fmt.Sprintf(
-				"%s%s%d%s"+"%s%s%d%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s"+"%s%s%x%s",
+				"%s%s%d%s"+"%s%s%d%s"+"%s%s%x%s"+"%s%s%x%s",
 				Timestamp, Delim, 123, EOL,
 				TreeSize, Delim, 456, EOL,
 				RootHash, Delim, testBuffer32[:], EOL,
 				Signature, Delim, testBuffer64[:], EOL,
-				KeyHash, Delim, testBuffer32[:], EOL,
-				Signature, Delim, testBuffer64[:], EOL,
-				KeyHash, Delim, testBuffer32[:], EOL,
 			)),
 			wantSth: &SignedTreeHead{
 				TreeHead: TreeHead{
@@ -251,16 +236,7 @@ func TestSignedTreeHeadUnmarshalASCII(t *testing.T) {
 					TreeSize:  456,
 					RootHash:  testBuffer32,
 				},
-				SigIdent: []*SigIdent{
-					&SigIdent{
-						Signature: testBuffer64,
-						KeyHash:   testBuffer32,
-					},
-					&SigIdent{
-						Signature: testBuffer64,
-						KeyHash:   testBuffer32,
-					},
-				},
+				Signature: testBuffer64,
 			},
 		},
 	} {
@@ -436,7 +412,7 @@ func TestCosignatureRequestUnmarshalASCII(t *testing.T) {
 			description: "valid",
 			buf: bytes.NewBufferString(fmt.Sprintf(
 				"%s%s%x%s"+"%s%s%x%s",
-				Signature, Delim, testBuffer64[:], EOL,
+				Cosignature, Delim, testBuffer64[:], EOL,
 				KeyHash, Delim, testBuffer32[:], EOL,
 			)),
 			wantReq: &CosignatureRequest{
-- 
cgit v1.2.3