enhancement/id (#55)

node/node.go

@@ -121,7 +121,7 @@ func (n *Node) AppendMessage(group state.GroupID, data []byte) (state.MessageID,
 		Body:      data,
 	}
 
-	id := state.ID(m)
+	id := m.ID()
 
 	peers, ok := n.peers[group]
 	if !ok {
@@ -278,7 +278,7 @@ func (n *Node) onMessages(group state.GroupID, sender state.PeerID, messages []*
 			continue
 		}
 
-		id := state.ID(*m)
+		id := m.ID()
 		log.Printf("[%x] sending ACK (%x -> %x): %x\n", group[:4], n.ID[:4], sender[:4], id[:4])
 		a = append(a, id[:])
 	}
@@ -287,7 +287,7 @@ func (n *Node) onMessages(group state.GroupID, sender state.PeerID, messages []*
 }
 
 func (n *Node) onMessage(group state.GroupID, sender state.PeerID, msg protobuf.Message) error {
-	id := state.ID(msg)
+	id := msg.ID()
 	log.Printf("[%x] MESSAGE (%x -> %x): %x received.\n", group[:4], sender[:4], n.ID[:4], id[:4])
 
 	err := n.syncState.Remove(group, id, sender)

state/sync_messageid.go → protobuf/messageid.go

@@ -1,17 +1,14 @@
-package state
+package protobuf
 
 import (
 	"crypto/sha256"
 	"encoding/binary"
 
-	"github.com/status-im/mvds/protobuf"
+	"github.com/status-im/mvds/state"
 )
 
-type MessageID [32]byte
-type GroupID [32]byte
-
 // ID creates the MessageID for a Message
-func ID(m protobuf.Message) MessageID {
+func (m Message) ID() state.MessageID {
 	t := make([]byte, 8)
 	binary.LittleEndian.PutUint64(t, uint64(m.Timestamp))
 
@@ -21,3 +18,5 @@ func ID(m protobuf.Message) MessageID {
 
 	return sha256.Sum256(b)
 }
+
+

state/sync_types.go

@@ -0,0 +1,4 @@
+package state
+
+type MessageID [32]byte
+type GroupID [32]byte

store/messagestore_dummy.go

@@ -39,6 +39,6 @@ func (ds *DummyStore) Get(id state.MessageID) (protobuf.Message, error) {
 func (ds *DummyStore) Add(message protobuf.Message) error {
 	ds.Lock()
 	defer ds.Unlock()
-	ds.ms[state.ID(message)] = message
+	ds.ms[message.ID()] = message
 	return nil
 }