Fix mistmatched versions

cmix/message/meteredCmixMessageBuffer.go

@@ -24,8 +24,6 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-const currentMeteredCmixMessageVersion = 0
-
 type meteredCmixMessageHandler struct{}
 
 type meteredCmixMessage struct {
@@ -49,7 +47,7 @@ func (*meteredCmixMessageHandler) SaveMessage(kv *versioned.KV, m interface{},
 
 	// Create versioned object
 	obj := versioned.Object{
-		Version:   currentMeteredCmixMessageVersion,
+		Version:   utility.CurrentMessageBufferVersion,
 		Timestamp: netTime.Now(),
 		Data:      marshaled,
 	}
@@ -57,7 +55,7 @@ func (*meteredCmixMessageHandler) SaveMessage(kv *versioned.KV, m interface{},
 	// Save versioned object
 	// fixme: this had differing versions in object and set,
 	//  reviewer please confirm this is correct before merge
-	return kv.Set(key, utility.CurrentMessageBufferVersion, &obj)
+	return kv.Set(key, &obj)
 }
 
 // LoadMessage returns the message with the specified key from the key value
@@ -66,7 +64,7 @@ func (*meteredCmixMessageHandler) SaveMessage(kv *versioned.KV, m interface{},
 func (*meteredCmixMessageHandler) LoadMessage(kv *versioned.KV, key string) (
 	interface{}, error) {
 	// Load the versioned object
-	vo, err := kv.Get(key, currentMeteredCmixMessageVersion)
+	vo, err := kv.Get(key, utility.CurrentMessageBufferVersion)
 	if err != nil {
 		return nil, err
 	}
@@ -85,7 +83,7 @@ func (*meteredCmixMessageHandler) LoadMessage(kv *versioned.KV, key string) (
 // DeleteMessage deletes the message with the specified key from the key value
 // store.
 func (*meteredCmixMessageHandler) DeleteMessage(kv *versioned.KV, key string) error {
-	return kv.Delete(key, currentMeteredCmixMessageVersion)
+	return kv.Delete(key, utility.CurrentMessageBufferVersion)
 }
 
 // HashMessage generates a hash of the message.

cmix/nodes/store.go

@@ -67,14 +67,14 @@ func (r *registrar) save() error {
 	}
 
 	obj := versioned.Object{
-		Version:   currentStoreVersion,
+		Version:   currentKeyVersion,
 		Timestamp: now,
 		Data:      data,
 	}
 
 	// fixme: this had differing versions in object and set,
 	//  reviewer please confirm this is correct before merge
-	return r.kv.Set(storeKey, currentKeyVersion, &obj)
+	return r.kv.Set(storeKey, &obj)
 }
 
 // marshal builds a byte representation of the registrar.

e2e/parse/partition/part.go

@@ -30,13 +30,13 @@ func savePart(kv *versioned.KV, partNum uint8, part []byte) error {
 	key := makeMultiPartMessagePartKey(partNum)
 
 	obj := versioned.Object{
-		Version:   currentMultiPartMessagePartVersion,
+		Version:   currentMultiPartMessageVersion,
 		Timestamp: netTime.Now(),
 		Data:      part,
 	}
 	// fixme: this had differing versions in object and set,
 	//  reviewer please confirm this is correct before merge
-	return kv.Set(key, currentMultiPartMessageVersion, &obj)
+	return kv.Set(key, &obj)
 }
 
 func deletePart(kv *versioned.KV, partNum uint8) error {

e2e/ratchet/partner/relationshipFingerprint.go

@@ -40,15 +40,14 @@ func makeRelationshipFingerprint(t session2.RelationshipType, grp *cyclic.Group,
 func storeRelationshipFingerprint(fp []byte, kv *versioned.KV) error {
 	now := netTime.Now()
 	obj := versioned.Object{
-		Version:   currentRelationshipFingerprintVersion,
+		Version:   currentRelationshipVersion,
 		Timestamp: now,
 		Data:      fp,
 	}
 
 	// fixme: this had differing versions in object and set,
 	//  reviewer please confirm this is correct before merge
-	return kv.Set(relationshipFingerprintKey, currentRelationshipVersion,
-		&obj)
+	return kv.Set(relationshipFingerprintKey, &obj)
 }
 
 func loadRelationshipFingerprint(kv *versioned.KV) []byte {

storage/user/registation.go

@@ -146,15 +146,14 @@ func (u *User) SetRegistrationTimestamp(tsNano int64) {
 	binary.BigEndian.PutUint64(tsBytes, uint64(tsNano))
 
 	obj := &versioned.Object{
-		Version:   currentRegValidationSigVersion,
+		Version:   registrationTimestampVersion,
 		Timestamp: netTime.Now(),
 		Data:      tsBytes,
 	}
 
 	// fixme: this had differing versions in object and set,
 	//  reviewer please confirm this is correct before merge
-	err := u.kv.Set(registrationTimestampKey,
-		registrationTimestampVersion, obj)
+	err := u.kv.Set(registrationTimestampKey, obj)
 	if err != nil {
 		jww.FATAL.Panicf("Failed to store the reception timestamp: %s", err)
 	}