From aa2c6878aae928837858528ee7b5ef8d36ea7a86 Mon Sep 17 00:00:00 2001 From: joshemb <josh@elixxir.io> Date: Fri, 2 Sep 2022 11:53:40 -0700 Subject: [PATCH] Remove FIXME notes for tracking kv.Set version mismatching --- cmix/message/meteredCmixMessageBuffer.go | 2 -- cmix/nodes/store.go | 2 -- e2e/parse/partition/part.go | 2 -- e2e/ratchet/partner/relationshipFingerprint.go | 2 -- storage/user/registation.go | 2 -- 5 files changed, 10 deletions(-) diff --git a/cmix/message/meteredCmixMessageBuffer.go b/cmix/message/meteredCmixMessageBuffer.go index 3c9eb1bb9..6111595c7 100644 --- a/cmix/message/meteredCmixMessageBuffer.go +++ b/cmix/message/meteredCmixMessageBuffer.go @@ -53,8 +53,6 @@ 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, &obj) } diff --git a/cmix/nodes/store.go b/cmix/nodes/store.go index ca903a2e8..88a605cd6 100644 --- a/cmix/nodes/store.go +++ b/cmix/nodes/store.go @@ -72,8 +72,6 @@ func (r *registrar) save() error { Data: data, } - // fixme: this had differing versions in object and set, - // reviewer please confirm this is correct before merge return r.kv.Set(storeKey, &obj) } diff --git a/e2e/parse/partition/part.go b/e2e/parse/partition/part.go index f73ed15b5..4baee3eee 100644 --- a/e2e/parse/partition/part.go +++ b/e2e/parse/partition/part.go @@ -34,8 +34,6 @@ func savePart(kv *versioned.KV, partNum uint8, part []byte) error { 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, &obj) } diff --git a/e2e/ratchet/partner/relationshipFingerprint.go b/e2e/ratchet/partner/relationshipFingerprint.go index f9a1246bf..f2ad22dea 100644 --- a/e2e/ratchet/partner/relationshipFingerprint.go +++ b/e2e/ratchet/partner/relationshipFingerprint.go @@ -45,8 +45,6 @@ func storeRelationshipFingerprint(fp []byte, kv *versioned.KV) error { Data: fp, } - // fixme: this had differing versions in object and set, - // reviewer please confirm this is correct before merge return kv.Set(relationshipFingerprintKey, &obj) } diff --git a/storage/user/registation.go b/storage/user/registation.go index d46d0f88d..5f9de3f8b 100644 --- a/storage/user/registation.go +++ b/storage/user/registation.go @@ -151,8 +151,6 @@ func (u *User) SetRegistrationTimestamp(tsNano int64) { Data: tsBytes, } - // fixme: this had differing versions in object and set, - // reviewer please confirm this is correct before merge err := u.kv.Set(registrationTimestampKey, obj) if err != nil { jww.FATAL.Panicf("Failed to store the reception timestamp: %s", err) -- GitLab