refactor: add missing format and encode methods to principals

Author: alanshaw

principal/ed25519/signer.go

@@ -46,6 +46,11 @@ func Parse(str string) (Signer, error) {
 	return Decode(bytes)
 }
 
+func Format(signer principal.Signer) string {
+	s, _ := multibase.Encode(multibase.Base64pad, signer.Bytes())
+	return s
+}
+
 // Decode decodes a buffer of an ed25519 signer multiformat varint (0x1300) + 32
 // byte ed25519 private key.
 func Decode(b []byte) (Signer, error) {
@@ -67,6 +72,10 @@ func Decode(b []byte) (Signer, error) {
 	return s, nil
 }
 
+func Encode(signer Signer) []byte {
+	return signer.Bytes()
+}
+
 // FromRaw takes raw 32 byte ed25519 private key bytes and tags with the ed25519
 // signer multiformat code, returning an ed25519 signer.
 func FromRaw(b []byte) (Signer, error) {

principal/ed25519/signer_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	ed "github.com/alanshaw/ucantone/principal/ed25519"
-	"github.com/alanshaw/ucantone/principal/signer"
 	"github.com/stretchr/testify/require"
 )
 
@@ -28,7 +27,7 @@ func TestGenerateFormatParse(t *testing.T) {
 
 	t.Log(s0.DID().String())
 
-	str := signer.Format(s0)
+	str := ed.Format(s0)
 	t.Log(str)
 
 	s1, err := ed.Parse(str)

principal/ed25519/verifier/verifier.go

@@ -38,6 +38,10 @@ func Parse(str string) (Verifier, error) {
 	return Decode(bytes)
 }
 
+func Format(verifier principal.Verifier) string {
+	return verifier.DID().String()
+}
+
 func Decode(b []byte) (Verifier, error) {
 	if len(b) != size {
 		return nil, fmt.Errorf("invalid length: %d wanted: %d", len(b), size)
@@ -54,6 +58,10 @@ func Decode(b []byte) (Verifier, error) {
 	return v, nil
 }
 
+func Encode(verifier Verifier) []byte {
+	return verifier
+}
+
 // FromRaw takes raw ed25519 public key bytes and tags with the ed25519 verifier
 // multiformat code, returning an ed25519 verifier.
 func FromRaw(b []byte) (Verifier, error) {

principal/secp256k1/signer.go

@@ -45,6 +45,11 @@ func Parse(str string) (Signer, error) {
 	return Decode(bytes)
 }
 
+func Format(signer principal.Signer) string {
+	s, _ := multibase.Encode(multibase.Base64pad, signer.Bytes())
+	return s
+}
+
 // Decode decodes a buffer of a secp256k1 signer multiformat varint (0x1301) +
 // 32 byte secp256k1 raw scalar value.
 func Decode(b []byte) (Signer, error) {
@@ -67,6 +72,10 @@ func Decode(b []byte) (Signer, error) {
 	return s, nil
 }
 
+func Encode(signer Signer) []byte {
+	return signer
+}
+
 // FromRaw takes raw 32 byte scalar value and tags with the secp256k1
 // signer multiformat code, returning a secp256k1 signer.
 func FromRaw(b []byte) (Signer, error) {

principal/secp256k1/signer_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	secp256k1 "github.com/alanshaw/ucantone/principal/secp256k1"
-	"github.com/alanshaw/ucantone/principal/signer"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/yawning/secp256k1-voi/secec"
 )
@@ -30,7 +29,7 @@ func TestGenerateFormatParse(t *testing.T) {
 
 	t.Log(s0.DID().String())
 
-	str := signer.Format(s0)
+	str := secp256k1.Format(s0)
 	t.Log(str)
 
 	s1, err := secp256k1.Parse(str)

principal/secp256k1/verifier/verifier.go

@@ -40,6 +40,10 @@ func Parse(str string) (Verifier, error) {
 	return Decode(bytes)
 }
 
+func Format(verifier principal.Verifier) string {
+	return verifier.DID().String()
+}
+
 func Decode(b []byte) (Verifier, error) {
 	if len(b) != size {
 		return nil, fmt.Errorf("invalid length: %d wanted: %d", len(b), size)
@@ -60,6 +64,10 @@ func Decode(b []byte) (Verifier, error) {
 	return v, nil
 }
 
+func Encode(verifier Verifier) []byte {
+	return verifier
+}
+
 // FromRaw takes raw secp256k1 compressed public key bytes and tags with the
 // secp256k1 verifier multiformat code, returning a secp256k1 verifier.
 func FromRaw(b []byte) (Verifier, error) {

principal/signer/signer.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/alanshaw/ucantone/did"
 	"github.com/alanshaw/ucantone/principal"
-	"github.com/alanshaw/ucantone/principal/ed25519"
 	"github.com/alanshaw/ucantone/principal/verifier"
 	"github.com/alanshaw/ucantone/varsig"
 	"github.com/multiformats/go-multibase"
@@ -72,7 +71,3 @@ func Format(signer principal.Signer) string {
 	s, _ := multibase.Encode(multibase.Base64pad, signer.Bytes())
 	return s
 }
-
-func Parse(s string) (principal.Signer, error) {
-	return ed25519.Parse(s)
-}

principal/signer/signer_test.go

@@ -17,7 +17,7 @@ func TestFormatParse(t *testing.T) {
 	str := signer.Format(s0)
 	t.Log(str)
 
-	s1, err := signer.Parse(str)
+	s1, err := ed25519.Parse(str)
 	require.NoError(t, err)
 
 	t.Log(s1.DID().String())

principal/verifier/verifier.go

@@ -51,3 +51,7 @@ func Wrap(key principal.Verifier, id did.DID) (*WrappedVerifier, error) {
 	}
 	return &WrappedVerifier{id, key}, nil
 }
+
+func Format(verifier principal.Verifier) string {
+	return verifier.DID().String()
+}