More fixes

storage/utility/e2eMessageBuffer.go

@@ -7,6 +7,7 @@
 
 package utility
 
+/*
 import (
 	"encoding/binary"
 	"encoding/json"
@@ -164,3 +165,4 @@ func (emb *E2eMessageBuffer) Failed(m message.Send, p params.E2E) {
 	emb.mb.Failed(e2eMessage{m.Recipient.Marshal(),
 		m.Payload, uint32(m.MessageType), p})
 }
+*/

storage/utility/group.go

@@ -29,11 +29,11 @@ func StoreGroup(kv *versioned.KV, grp *cyclic.Group, key string) error {
 		Data:      data,
 	}
 
-	return kv.Set(key, currentE2EMessageVersion, &obj)
+	return kv.Set(key, currentGroupVersion, &obj)
 }
 
 func LoadGroup(kv *versioned.KV, key string) (*cyclic.Group, error) {
-	vo, err := kv.Get(key, currentE2EMessageVersion)
+	vo, err := kv.Get(key, currentGroupVersion)
 	if err != nil {
 		return nil, err
 	}