X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=pkg%2Fkey%2Fkey_test.go;h=a2c1426b5dd55473d2fbe69faa5aeb12e86c947b;hb=a6d3c7c07507062519a125e3f0f10d8a212fd483;hp=cfe912cae15f08708559cb00f07e1ef3cf179793;hpb=1fa7a71a7e46fa49950721656bce99a4d7131d06;p=epoint

diff --git a/pkg/key/key_test.go b/pkg/key/key_test.go
index cfe912c..a2c1426 100644
--- a/pkg/key/key_test.go
+++ b/pkg/key/key_test.go
@@ -24,24 +24,51 @@ func testSignAndVerify(t *testing.T, priv *openpgp.Entity) {
 }
 
 func TestKey(t *testing.T) {
-	key, err := GenKey()
+	key, err := RandomDsaKey()
 	if err != nil {
 		t.Errorf("gen dsa key failed: %s", err)
 		return
 	}
-	priv, err := NewEntity(key, time.Seconds(), "a", "b", "c")
+	priv, err := New(key, time.Now(), "a", "b", "c")
 	if err != nil {
-		t.Errorf("new entity failed: %s", err)
+		t.Errorf("New failed: %s", err)
 	} else {
 		testSignAndVerify(t, priv)
 	}
+
+	// serialize
+	err = SelfSign(priv)
+	if err != nil {
+		t.Errorf("SelfSign failed: %s", err)
+	}
+	d, err := Format(priv)
+	if err != nil {
+		t.Errorf("Format failed: %s", err)
+	}
+	_, err = Parse(d)
+	if err != nil {
+		t.Errorf("Parse failed: %s", err)
+	}
 }
 
-func TestGenIssuer(t *testing.T) {
+func TestId(t *testing.T) {
+	idwant := "E51F405B809FA2DEA760603F9D33F730611CBCD9"
+	key, err := Issuer([]byte("rand"), "")
+	if err != nil {
+		t.Errorf("Issuer failed: %s", err)
+		return
+	}
+	id := Id(key)
+	if id != idwant {
+		t.Errorf("Id failed: expected %s, got %s", idwant, id)
+	}
+}
+
+func TestIssuerHolder(t *testing.T) {
 	denomination := "1/100 EUR"
-	priv, err := NewIssuerEntity([]byte("issuer-rand"), denomination)
+	priv, err := Issuer([]byte("issuer-rand"), denomination)
 	if err != nil {
-		t.Errorf("new entity failed: %s", err)
+		t.Errorf("Issuer failed: %s", err)
 	} else {
 		testSignAndVerify(t, priv)
 	}
@@ -62,9 +89,9 @@ func TestGenIssuer(t *testing.T) {
 		t.Errorf("pub key parsing failed: %s", err)
 		return
 	}
-	isIssuer, issuer, denom, err := CheckEntity(es[0])
+	isIssuer, issuer, denom, err := Check(es[0])
 	if err != nil {
-		t.Errorf("pub key parsing failed: %s", err)
+		t.Errorf("Check failed: %s", err)
 		return
 	}
 	if !isIssuer {
@@ -78,9 +105,9 @@ func TestGenIssuer(t *testing.T) {
 		t.Errorf("expected denomination %q got %q", denomination, denom)
 	}
 
-	priv, err = NewHolderEntity([]byte("holder-rand"), issuerfpr, denomination)
+	priv, err = Holder([]byte("holder-rand"), issuerfpr, denomination)
 	if err != nil {
-		t.Errorf("new entity failed: %s", err)
+		t.Errorf("Holder failed: %s", err)
 	} else {
 		testSignAndVerify(t, priv)
 	}
@@ -101,9 +128,9 @@ func TestGenIssuer(t *testing.T) {
 		t.Errorf("pub key parsing failed: %s", err)
 		return
 	}
-	isIssuer, issuer, denom, err = CheckEntity(es[0])
+	isIssuer, issuer, denom, err = Check(es[0])
 	if err != nil {
-		t.Errorf("pub key parsing failed: %s", err)
+		t.Errorf("Check failed: %s", err)
 		return
 	}
 	if isIssuer {