Remove complexity from message. Leave it to apps.

key/signing.go

@@ -35,7 +35,8 @@ func (k *SigningKey) Sign(data []byte) ([]byte, error) {
 	return ed25519.Sign(k.PrivKey, data), nil
 }
 
-// Generates a signing key for the given identifier, ie. IPNS name
+// Generates a signing key for the given identifier, ie. IPNS name.
+// The IPNS key itself could be used, but lets stick to a more common DID structure.
 func NewSigningKey(d did.DID) (SigningKey, error) {
 
 	name, err := nanoid.New()
@@ -121,7 +122,7 @@ func validateSigningPrivateKey(privKey ed25519.PrivateKey) error {
 	}
 
 	if len(privKey) != ed25519.PrivateKeySize {
-		return fmt.Errorf("Invalid key length %d, should be %d: %w", len(privKey), ed25519.PrivateKeySize, ErrInvalidKeySize)
+		return fmt.Errorf("invalid key length %d, should be %d: %w", len(privKey), ed25519.PrivateKeySize, ErrInvalidKeySize)
 	}
 	return nil
 }

msg/errors.go

@@ -9,12 +9,10 @@ import (
 var (
 	ErrBroadcastHasRecipient = fmt.Errorf("broadcast message must not have a recipient")
 	ErrBroadcastInvalidTopic = fmt.Errorf("broadcast topic must be %s", ma.BROADCAST_TOPIC)
-	ErrBroadcastInvalidType  = fmt.Errorf("broadcast message must not %s", BROADCAST)
-	ErrEmptyID               = fmt.Errorf("id must be non-empty")
 	ErrInvalidID             = fmt.Errorf("invalid message id")
+	ErrEmptyID               = fmt.Errorf("empty message id")
 	ErrFetchDoc              = fmt.Errorf("failed to fetch entity document")
 	ErrInvalidMessageType    = fmt.Errorf("invalid Message type")
-	ErrInvalidSender         = fmt.Errorf("invalid sender")
 	ErrInvalidRecipient      = fmt.Errorf("invalid recipient")
 	ErrMissingContentType    = fmt.Errorf("empty ContentType")
 	ErrMissingContent        = fmt.Errorf("empty ContentType")

msg/message.go

@@ -5,13 +5,15 @@ import (
 	"crypto/ed25519"
 	"fmt"
 
+	"github.com/bahner/go-ma"
 	cbor "github.com/fxamacker/cbor/v2"
 	pubsub "github.com/libp2p/go-libp2p-pubsub"
 	nanoid "github.com/matoous/go-nanoid/v2"
 )
 
 const (
-	PREFIX               = "/ma/message/"
+	PREFIX               = "/ma/"
+	MESSAGE              = PREFIX + ma.VERSION
 	DEFAULT_CONTENT_TYPE = "text/plain"
 )
 
@@ -39,7 +41,6 @@ type Message struct {
 func New(
 	from string,
 	to string,
-	msg_type string,
 	content []byte,
 	contentType string,
 	priv_key ed25519.PrivateKey) (*Message, error) {
@@ -52,7 +53,7 @@ func New(
 	m := &Message{
 		// Message meta data
 		Id:   id,
-		Type: msg_type,
+		Type: MESSAGE,
 		// Recipient
 		From: from,
 		To:   to,

msg/validate.go

@@ -132,9 +132,7 @@ func verifyID(id string) error {
 func verifyType(t string) error {
 
 	if t == BROADCAST ||
-		t == CHAT ||
-		t == REQUEST ||
-		t == REPLY {
+		t == MESSAGE {
 		return nil
 	}