key cleanup

[epoint] / pkg / key / key_test.go

diff --git a/pkg/key/key_test.go b/pkg/key/key_test.go
index cfe912c..1e594fe 100644 (file)
--- a/pkg/key/key_test.go
+++ b/pkg/key/key_test.go
@@ -24,24 +24,24 @@ 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.Seconds(), "a", "b", "c")
        if err != nil {
-               t.Errorf("new entity failed: %s", err)
+               t.Errorf("New failed: %s", err)
        } else {
                testSignAndVerify(t, priv)
        }
 }
 
-func TestGenIssuer(t *testing.T) {
+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 +62,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 +78,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 +101,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 {