From 05be0b4dbd120a0e5231547a15f0a1f147baf47b Mon Sep 17 00:00:00 2001
From: benjamin <ben@elixxir.io>
Date: Wed, 31 May 2023 15:23:43 -0700
Subject: [PATCH] moved storage/versioned to collective/versioned
---
auth/state.go | 2 +-
auth/state_test.go | 2 +-
auth/store/confirmation.go | 2 +-
auth/store/confirmation_test.go | 2 +-
auth/store/previousNegotiations.go | 2 +-
auth/store/previousNegotiations_test.go | 2 +-
auth/store/receivedRequest.go | 2 +-
auth/store/sentRequest.go | 2 +-
auth/store/store.go | 2 +-
auth/store/store_test.go | 2 +-
backup/backup.go | 2 +-
backup/backup_test.go | 2 +-
backup/jsonStorage.go | 2 +-
backup/jsonStorage_test.go | 2 +-
backup/keyStorage.go | 2 +-
bindings/cmix.go | 2 +-
bindings/collective.go | 2 +-
channels/actionSaver.go | 2 +-
channels/actionSaver_test.go | 2 +-
channels/commandStore.go | 2 +-
channels/commandStore_test.go | 2 +-
channels/eventModel.go | 2 +-
channels/eventModel_test.go | 2 +-
channels/identityStore.go | 2 +-
channels/identityStore_test.go | 2 +-
channels/joinedChannel.go | 2 +-
channels/lease.go | 2 +-
channels/lease_test.go | 2 +-
channels/manager.go | 2 +-
channels/mutedUsers.go | 2 +-
channels/mutedUsers_test.go | 2 +-
channels/nickname.go | 2 +-
channels/nickname_test.go | 2 +-
channels/privateKey.go | 2 +-
channels/privateKey_test.go | 2 +-
channels/replayBlocker.go | 2 +-
channels/replayBlocker_test.go | 2 +-
channels/sendTracker.go | 2 +-
channels/sendTracker_test.go | 2 +-
channels/send_test.go | 2 +-
channelsFileTransfer/manager.go | 2 +-
channelsFileTransfer/store/cypher/manager.go | 2 +-
channelsFileTransfer/store/cypher/manager_test.go | 2 +-
channelsFileTransfer/store/received.go | 2 +-
channelsFileTransfer/store/receivedTransfer.go | 2 +-
channelsFileTransfer/store/receivedTransfer_test.go | 2 +-
channelsFileTransfer/store/received_test.go | 2 +-
channelsFileTransfer/store/sent.go | 2 +-
channelsFileTransfer/store/sentTransfer.go | 2 +-
channelsFileTransfer/store/sentTransfer_test.go | 2 +-
channelsFileTransfer/store/sent_test.go | 2 +-
channelsFileTransfer/utils_test.go | 2 +-
cmd/dm.go | 2 +-
cmd/sync.go | 2 +-
cmix/check_test.go | 2 +-
cmix/cmixMessageBuffer.go | 2 +-
cmix/cmixMessageBuffer_test.go | 2 +-
cmix/critical.go | 2 +-
cmix/critical_test.go | 2 +-
cmix/gateway/certChecker.go | 2 +-
cmix/gateway/certChecker_test.go | 2 +-
cmix/gateway/hostPool.go | 2 +-
cmix/gateway/storeHostList.go | 2 +-
cmix/identity/receptionID/identity.go | 2 +-
cmix/identity/receptionID/identity_test.go | 2 +-
cmix/identity/receptionID/registration.go | 2 +-
cmix/identity/receptionID/registration_test.go | 2 +-
cmix/identity/receptionID/store.go | 2 +-
cmix/identity/receptionID/store/checkedRounds.go | 2 +-
cmix/identity/receptionID/store/checkedRounds_test.go | 2 +-
cmix/identity/receptionID/store/earliestRound.go | 2 +-
cmix/identity/receptionID/store/unknownRounds.go | 2 +-
cmix/identity/receptionID/store/unknownRounds_test.go | 2 +-
cmix/identity/receptionID/store_test.go | 2 +-
cmix/identity/tracker.go | 2 +-
cmix/message/handler.go | 2 +-
cmix/message/handler_test.go | 2 +-
cmix/message/inProgress_test.go | 2 +-
cmix/message/meteredCmixMessageBuffer.go | 2 +-
cmix/message/meteredCmixMessageBuffer_test.go | 2 +-
cmix/nodes/interfaces.go | 2 +-
cmix/nodes/registrar.go | 2 +-
cmix/nodes/store.go | 2 +-
cmix/nodes/storeKey.go | 2 +-
cmix/nodes/utils_test.go | 2 +-
cmix/pickup/store/store.go | 2 +-
cmix/pickup/store/uncheckedRounds.go | 2 +-
cmix/pickup/store/uncheckedRounds_test.go | 2 +-
cmix/rounds/roundStorage.go | 2 +-
collective/collector.go | 2 +-
collective/instanceID_test.go | 2 +-
collective/kv.go | 2 +-
collective/kv_test.go | 2 +-
collective/map.go | 2 +-
collective/synckv.go | 2 +-
collective/synckv_test.go | 2 +-
collective/testing.go | 2 +-
collective/transactionLog.go | 2 +-
{storage => collective}/versioned/kv.go | 0
{storage => collective}/versioned/kv_test.go | 0
{storage => collective}/versioned/mapSyntax.go | 0
{storage => collective}/versioned/object.go | 0
{storage => collective}/versioned/object_test.go | 0
dm/client.go | 2 +-
dm/client_test.go | 2 +-
dm/dm_test.go | 2 +-
dm/sendTracker.go | 2 +-
dm/sendTracker_test.go | 2 +-
e2e/critical.go | 2 +-
e2e/e2eMessageBuffer.go | 2 +-
e2e/e2eMessageBuffer_test.go | 2 +-
e2e/manager.go | 2 +-
e2e/parse/conversation/partner.go | 2 +-
e2e/parse/conversation/partner_test.go | 2 +-
e2e/parse/conversation/ring.go | 2 +-
e2e/parse/conversation/ring_test.go | 2 +-
e2e/parse/conversation/store.go | 2 +-
e2e/parse/conversation/store_test.go | 2 +-
e2e/parse/partition.go | 2 +-
e2e/parse/partition/multiPartMessage.go | 2 +-
e2e/parse/partition/multiPartMessage_test.go | 2 +-
e2e/parse/partition/part.go | 2 +-
e2e/parse/partition/part_test.go | 2 +-
e2e/parse/partition/store.go | 2 +-
e2e/parse/partition/store_test.go | 2 +-
e2e/parse/partition_test.go | 2 +-
e2e/ratchet/partner/manager.go | 2 +-
e2e/ratchet/partner/relationship.go | 2 +-
e2e/ratchet/partner/relationshipFingerprint.go | 2 +-
e2e/ratchet/partner/relationship_test.go | 2 +-
e2e/ratchet/partner/session/session.go | 2 +-
e2e/ratchet/partner/session/testUtils.go | 2 +-
e2e/ratchet/partner/utils_test.go | 2 +-
e2e/ratchet/ratchet.go | 2 +-
e2e/ratchet/ratchet_test.go | 2 +-
e2e/ratchet/storage.go | 2 +-
e2e/ratchet/utils_test.go | 2 +-
e2e/rekey/confirm_test.go | 2 +-
e2e/rekey/exchange_test.go | 2 +-
e2e/rekey/trigger_test.go | 2 +-
e2e/sendE2E_test.go | 2 +-
e2e/sendUnsafe_test.go | 2 +-
fileTransfer/connect/utils_test.go | 2 +-
fileTransfer/e2e/utils_test.go | 2 +-
fileTransfer/groupChat/utils_test.go | 2 +-
fileTransfer/manager.go | 2 +-
fileTransfer/store/cypher/manager.go | 2 +-
fileTransfer/store/cypher/manager_test.go | 2 +-
fileTransfer/store/received.go | 2 +-
fileTransfer/store/receivedTransfer.go | 2 +-
fileTransfer/store/receivedTransfer_test.go | 2 +-
fileTransfer/store/received_test.go | 2 +-
fileTransfer/store/sent.go | 2 +-
fileTransfer/store/sentTransfer.go | 2 +-
fileTransfer/store/sentTransfer_test.go | 2 +-
fileTransfer/store/sent_test.go | 2 +-
fileTransfer/utils_test.go | 2 +-
groupChat/groupStore/group.go | 2 +-
groupChat/groupStore/group_test.go | 2 +-
groupChat/groupStore/store.go | 2 +-
groupChat/groupStore/store_test.go | 2 +-
groupChat/manager_test.go | 2 +-
groupChat/messenger_test.go | 2 +-
groupChat/session_test.go | 2 +-
groupChat/utils_test.go | 2 +-
notifications/manager.go | 2 +-
notifications/manager_test.go | 2 +-
notifications/notifications.go | 2 +-
storage/clientVersion/store.go | 2 +-
storage/clientVersion/store_test.go | 2 +-
storage/ndf.go | 2 +-
storage/regCode.go | 2 +-
storage/regStatus.go | 2 +-
storage/session.go | 2 +-
storage/user/cryptographic.go | 2 +-
storage/user/cryptographic_test.go | 2 +-
storage/user/registation.go | 2 +-
storage/user/registation_test.go | 2 +-
storage/user/user.go | 2 +-
storage/user/user_test.go | 2 +-
storage/user/username.go | 2 +-
storage/user/username_test.go | 2 +-
storage/utility/NDF.go | 2 +-
storage/utility/NDF_js.go | 2 +-
storage/utility/blockStore.go | 2 +-
storage/utility/blockStore_test.go | 2 +-
storage/utility/bucket.go | 2 +-
storage/utility/bucketParams.go | 2 +-
storage/utility/bucketParams_test.go | 2 +-
storage/utility/contact.go | 2 +-
storage/utility/dh.go | 2 +-
storage/utility/dh_test.go | 2 +-
storage/utility/encryptionSalt.go | 2 +-
storage/utility/encryptionSalt_test.go | 2 +-
storage/utility/group.go | 2 +-
storage/utility/group_test.go | 2 +-
storage/utility/id.go | 2 +-
storage/utility/messageBuffer.go | 2 +-
storage/utility/messageBuffer_test.go | 2 +-
storage/utility/multiStateVector.go | 2 +-
storage/utility/multiStateVector_test.go | 2 +-
storage/utility/sidh.go | 2 +-
storage/utility/sidh_test.go | 2 +-
storage/utility/stateVector.go | 2 +-
storage/utility/stateVector_test.go | 2 +-
ud/channelIDTracking.go | 2 +-
ud/channelIDTracking_test.go | 2 +-
ud/manager.go | 2 +-
ud/mockE2e_test.go | 2 +-
ud/mockStore_test.go | 2 +-
ud/registered.go | 2 +-
ud/store/facts_test.go | 2 +-
ud/store/store.go | 2 +-
ud/store/store_test.go | 2 +-
ud/utils_test.go | 2 +-
xxdk/cmix.go | 2 +-
xxdk/e2e.go | 2 +-
xxdk/identity.go | 2 +-
xxdk/kv.go | 2 +-
xxmutils/restoreContacts.go | 2 +-
220 files changed, 215 insertions(+), 215 deletions(-)
rename {storage => collective}/versioned/kv.go (100%)
rename {storage => collective}/versioned/kv_test.go (100%)
rename {storage => collective}/versioned/mapSyntax.go (100%)
rename {storage => collective}/versioned/object.go (100%)
rename {storage => collective}/versioned/object_test.go (100%)
diff --git a/auth/state.go b/auth/state.go
index a0f106952..58fe47714 100644
--- a/auth/state.go
+++ b/auth/state.go
@@ -15,10 +15,10 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/event"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/auth/state_test.go b/auth/state_test.go
index dc7cca105..1276c469b 100644
--- a/auth/state_test.go
+++ b/auth/state_test.go
@@ -21,11 +21,11 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/storage"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/auth/store/confirmation.go b/auth/store/confirmation.go
index 4f1ca8963..d28be3655 100644
--- a/auth/store/confirmation.go
+++ b/auth/store/confirmation.go
@@ -10,7 +10,7 @@ package store
import (
"encoding/base64"
"encoding/json"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/auth/store/confirmation_test.go b/auth/store/confirmation_test.go
index b60f29f0a..dd9cb17b9 100644
--- a/auth/store/confirmation_test.go
+++ b/auth/store/confirmation_test.go
@@ -13,8 +13,8 @@ import (
"testing"
"github.com/cloudflare/circl/dh/sidh"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/e2e/auth"
diff --git a/auth/store/previousNegotiations.go b/auth/store/previousNegotiations.go
index 5941d4d54..c70fdb50e 100644
--- a/auth/store/previousNegotiations.go
+++ b/auth/store/previousNegotiations.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/e2e/auth"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/auth/store/previousNegotiations_test.go b/auth/store/previousNegotiations_test.go
index 557a49911..84732a1da 100644
--- a/auth/store/previousNegotiations_test.go
+++ b/auth/store/previousNegotiations_test.go
@@ -13,8 +13,8 @@ import (
"testing"
"github.com/cloudflare/circl/dh/sidh"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/e2e/auth"
diff --git a/auth/store/receivedRequest.go b/auth/store/receivedRequest.go
index 3bd07fdb3..f5cf95a55 100644
--- a/auth/store/receivedRequest.go
+++ b/auth/store/receivedRequest.go
@@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/auth/store/sentRequest.go b/auth/store/sentRequest.go
index 18d9841dc..0965e4b7a 100644
--- a/auth/store/sentRequest.go
+++ b/auth/store/sentRequest.go
@@ -16,8 +16,8 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
diff --git a/auth/store/store.go b/auth/store/store.go
index cca5b47ab..2485264d9 100644
--- a/auth/store/store.go
+++ b/auth/store/store.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/primitives/format"
diff --git a/auth/store/store_test.go b/auth/store/store_test.go
index b4538ee87..cbbfb145f 100644
--- a/auth/store/store_test.go
+++ b/auth/store/store_test.go
@@ -17,9 +17,9 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/backup/backup.go b/backup/backup.go
index 4399edadf..ca1f9c30d 100644
--- a/backup/backup.go
+++ b/backup/backup.go
@@ -12,7 +12,7 @@ import (
"sync"
"time"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/primitives/fact"
"gitlab.com/xx_network/primitives/id"
diff --git a/backup/backup_test.go b/backup/backup_test.go
index 858f58f87..cdd6e8562 100644
--- a/backup/backup_test.go
+++ b/backup/backup_test.go
@@ -15,8 +15,8 @@ import (
"gitlab.com/elixxir/client/v4/xxdk"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/crypto/backup"
diff --git a/backup/jsonStorage.go b/backup/jsonStorage.go
index 3403ecb46..0bf9d6fe6 100644
--- a/backup/jsonStorage.go
+++ b/backup/jsonStorage.go
@@ -8,7 +8,7 @@
package backup
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/backup/jsonStorage_test.go b/backup/jsonStorage_test.go
index 02588ed20..7437474dc 100644
--- a/backup/jsonStorage_test.go
+++ b/backup/jsonStorage_test.go
@@ -10,7 +10,7 @@ package backup
import (
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
)
diff --git a/backup/keyStorage.go b/backup/keyStorage.go
index 8d96e5b85..fbb7e0f99 100644
--- a/backup/keyStorage.go
+++ b/backup/keyStorage.go
@@ -10,7 +10,7 @@ package backup
import (
"bytes"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/backup"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/bindings/cmix.go b/bindings/cmix.go
index 80685200e..6ce4f7807 100644
--- a/bindings/cmix.go
+++ b/bindings/cmix.go
@@ -13,7 +13,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
)
diff --git a/bindings/collective.go b/bindings/collective.go
index d39706fd8..762941032 100644
--- a/bindings/collective.go
+++ b/bindings/collective.go
@@ -13,7 +13,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
)
////////////////////////////////////////////////////////////////////////////////
diff --git a/channels/actionSaver.go b/channels/actionSaver.go
index 4cb2258db..35ff85ca2 100644
--- a/channels/actionSaver.go
+++ b/channels/actionSaver.go
@@ -17,8 +17,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channels/actionSaver_test.go b/channels/actionSaver_test.go
index 366f712fa..cbf10fa93 100644
--- a/channels/actionSaver_test.go
+++ b/channels/actionSaver_test.go
@@ -19,7 +19,7 @@ import (
"time"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/channels/commandStore.go b/channels/commandStore.go
index 08883a424..44b699ef9 100644
--- a/channels/commandStore.go
+++ b/channels/commandStore.go
@@ -13,7 +13,7 @@ import (
"encoding/json"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/hash"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/xx_network/primitives/id"
diff --git a/channels/commandStore_test.go b/channels/commandStore_test.go
index 4c5ff8664..edb15ddb7 100644
--- a/channels/commandStore_test.go
+++ b/channels/commandStore_test.go
@@ -11,7 +11,7 @@ import (
"encoding/json"
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/ekv"
diff --git a/channels/eventModel.go b/channels/eventModel.go
index 5daa2433a..4e86e9ca8 100644
--- a/channels/eventModel.go
+++ b/channels/eventModel.go
@@ -21,8 +21,8 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/emoji"
- "gitlab.com/elixxir/client/v4/storage/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
diff --git a/channels/eventModel_test.go b/channels/eventModel_test.go
index 9a184d0bb..6df51995f 100644
--- a/channels/eventModel_test.go
+++ b/channels/eventModel_test.go
@@ -20,7 +20,7 @@ import (
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channels/identityStore.go b/channels/identityStore.go
index 5a5decb68..cac1b0df7 100644
--- a/channels/identityStore.go
+++ b/channels/identityStore.go
@@ -1,7 +1,7 @@
package channels
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/channels/identityStore_test.go b/channels/identityStore_test.go
index 9f5b87f38..00bdd2757 100644
--- a/channels/identityStore_test.go
+++ b/channels/identityStore_test.go
@@ -9,7 +9,7 @@ package channels
import (
"bytes"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/channels/joinedChannel.go b/channels/joinedChannel.go
index 80520b856..8b297cb18 100644
--- a/channels/joinedChannel.go
+++ b/channels/joinedChannel.go
@@ -12,7 +12,7 @@ import (
"encoding/json"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/broadcast"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
"gitlab.com/xx_network/primitives/id"
"time"
diff --git a/channels/lease.go b/channels/lease.go
index a6487e049..e9e41c141 100644
--- a/channels/lease.go
+++ b/channels/lease.go
@@ -16,8 +16,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/hash"
"gitlab.com/elixxir/crypto/message"
diff --git a/channels/lease_test.go b/channels/lease_test.go
index cc38c56bb..bd6fc4171 100644
--- a/channels/lease_test.go
+++ b/channels/lease_test.go
@@ -22,8 +22,8 @@ import (
"time"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/ekv"
diff --git a/channels/manager.go b/channels/manager.go
index f40d1f6cb..bc07f444a 100644
--- a/channels/manager.go
+++ b/channels/manager.go
@@ -25,8 +25,8 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
clientNotif "gitlab.com/elixxir/client/v4/notifications"
- "gitlab.com/elixxir/client/v4/storage/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channels/mutedUsers.go b/channels/mutedUsers.go
index 157248903..0b7763730 100644
--- a/channels/mutedUsers.go
+++ b/channels/mutedUsers.go
@@ -14,7 +14,7 @@ import (
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
"sync"
diff --git a/channels/mutedUsers_test.go b/channels/mutedUsers_test.go
index b0876d8a8..bfc411e41 100644
--- a/channels/mutedUsers_test.go
+++ b/channels/mutedUsers_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"crypto/ed25519"
"fmt"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"io"
diff --git a/channels/nickname.go b/channels/nickname.go
index 33a1486b4..33dad6ef6 100644
--- a/channels/nickname.go
+++ b/channels/nickname.go
@@ -5,7 +5,7 @@ import (
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
"sync"
diff --git a/channels/nickname_test.go b/channels/nickname_test.go
index af42e2047..5ace4749e 100644
--- a/channels/nickname_test.go
+++ b/channels/nickname_test.go
@@ -10,7 +10,7 @@ import (
"time"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/channels/privateKey.go b/channels/privateKey.go
index b77ff4141..42e3ec84f 100644
--- a/channels/privateKey.go
+++ b/channels/privateKey.go
@@ -11,7 +11,7 @@ import (
"bytes"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
"gitlab.com/elixxir/crypto/rsa"
"gitlab.com/xx_network/primitives/id"
diff --git a/channels/privateKey_test.go b/channels/privateKey_test.go
index 58b26b2e6..89e899c1c 100644
--- a/channels/privateKey_test.go
+++ b/channels/privateKey_test.go
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/broadcast"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/channels/replayBlocker.go b/channels/replayBlocker.go
index b44bd4f97..b4348b5f0 100644
--- a/channels/replayBlocker.go
+++ b/channels/replayBlocker.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channels/replayBlocker_test.go b/channels/replayBlocker_test.go
index c7d66d9a5..772658ae0 100644
--- a/channels/replayBlocker_test.go
+++ b/channels/replayBlocker_test.go
@@ -14,7 +14,7 @@ import (
"fmt"
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/channels/sendTracker.go b/channels/sendTracker.go
index 4dde35598..46610a279 100644
--- a/channels/sendTracker.go
+++ b/channels/sendTracker.go
@@ -17,7 +17,7 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/primitives/states"
diff --git a/channels/sendTracker_test.go b/channels/sendTracker_test.go
index ba583989c..08e0d05b8 100644
--- a/channels/sendTracker_test.go
+++ b/channels/sendTracker_test.go
@@ -8,7 +8,7 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
cryptoMessage "gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/ekv"
diff --git a/channels/send_test.go b/channels/send_test.go
index e334bf3d5..0e1a15c5f 100644
--- a/channels/send_test.go
+++ b/channels/send_test.go
@@ -19,7 +19,7 @@ import (
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
diff --git a/channelsFileTransfer/manager.go b/channelsFileTransfer/manager.go
index 77c1ca62b..9c21a5ee3 100644
--- a/channelsFileTransfer/manager.go
+++ b/channelsFileTransfer/manager.go
@@ -25,10 +25,10 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/channelsFileTransfer/store/cypher/manager.go b/channelsFileTransfer/store/cypher/manager.go
index 1a52e290c..f7cd3b9bb 100644
--- a/channelsFileTransfer/store/cypher/manager.go
+++ b/channelsFileTransfer/store/cypher/manager.go
@@ -10,8 +10,8 @@ package cypher
import (
"github.com/pkg/errors"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/channelsFileTransfer/store/cypher/manager_test.go b/channelsFileTransfer/store/cypher/manager_test.go
index 141ce675d..33d0d70d1 100644
--- a/channelsFileTransfer/store/cypher/manager_test.go
+++ b/channelsFileTransfer/store/cypher/manager_test.go
@@ -16,8 +16,8 @@ import (
"github.com/stretchr/testify/require"
"gitlab.com/xx_network/crypto/csprng"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
)
diff --git a/channelsFileTransfer/store/received.go b/channelsFileTransfer/store/received.go
index 31dacb7aa..a3e13a16a 100644
--- a/channelsFileTransfer/store/received.go
+++ b/channelsFileTransfer/store/received.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channelsFileTransfer/store/receivedTransfer.go b/channelsFileTransfer/store/receivedTransfer.go
index 1933e1630..350b0805d 100644
--- a/channelsFileTransfer/store/receivedTransfer.go
+++ b/channelsFileTransfer/store/receivedTransfer.go
@@ -18,8 +18,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/channelsFileTransfer/store/cypher"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channelsFileTransfer/store/receivedTransfer_test.go b/channelsFileTransfer/store/receivedTransfer_test.go
index f5e231c65..de30dcb9e 100644
--- a/channelsFileTransfer/store/receivedTransfer_test.go
+++ b/channelsFileTransfer/store/receivedTransfer_test.go
@@ -21,8 +21,8 @@ import (
"gitlab.com/xx_network/primitives/id"
"gitlab.com/elixxir/client/v4/channelsFileTransfer/store/cypher"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
)
diff --git a/channelsFileTransfer/store/received_test.go b/channelsFileTransfer/store/received_test.go
index 498a427cb..c80c1708a 100644
--- a/channelsFileTransfer/store/received_test.go
+++ b/channelsFileTransfer/store/received_test.go
@@ -16,7 +16,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/channelsFileTransfer/store/sent.go b/channelsFileTransfer/store/sent.go
index ed1fa78db..00f632633 100644
--- a/channelsFileTransfer/store/sent.go
+++ b/channelsFileTransfer/store/sent.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channelsFileTransfer/store/sentTransfer.go b/channelsFileTransfer/store/sentTransfer.go
index 7d1ae40bc..6930ef302 100644
--- a/channelsFileTransfer/store/sentTransfer.go
+++ b/channelsFileTransfer/store/sentTransfer.go
@@ -18,8 +18,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/channelsFileTransfer/store/cypher"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/channelsFileTransfer/store/sentTransfer_test.go b/channelsFileTransfer/store/sentTransfer_test.go
index c4957dc57..5f4a9c5a2 100644
--- a/channelsFileTransfer/store/sentTransfer_test.go
+++ b/channelsFileTransfer/store/sentTransfer_test.go
@@ -20,8 +20,8 @@ import (
"gitlab.com/elixxir/client/v4/channelsFileTransfer/store/cypher"
"gitlab.com/elixxir/client/v4/channelsFileTransfer/store/fileMessage"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
diff --git a/channelsFileTransfer/store/sent_test.go b/channelsFileTransfer/store/sent_test.go
index 9140b27cb..e953a0d44 100644
--- a/channelsFileTransfer/store/sent_test.go
+++ b/channelsFileTransfer/store/sent_test.go
@@ -17,7 +17,7 @@ import (
"time"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/channelsFileTransfer/utils_test.go b/channelsFileTransfer/utils_test.go
index 68920cad3..ff411f675 100644
--- a/channelsFileTransfer/utils_test.go
+++ b/channelsFileTransfer/utils_test.go
@@ -28,11 +28,11 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
userStorage "gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/network"
cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast"
diff --git a/cmd/dm.go b/cmd/dm.go
index 602fe1df4..bdde8de9b 100644
--- a/cmd/dm.go
+++ b/cmd/dm.go
@@ -19,8 +19,8 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/dm"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/codename"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/crypto/nike/ecdh"
diff --git a/cmd/sync.go b/cmd/sync.go
index 5aa38bef5..afd1b6e51 100644
--- a/cmd/sync.go
+++ b/cmd/sync.go
@@ -15,8 +15,8 @@ import (
"time"
"gitlab.com/elixxir/client/v4/collective"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/cmix/check_test.go b/cmix/check_test.go
index 12b72bd14..f7c5ea12c 100644
--- a/cmix/check_test.go
+++ b/cmix/check_test.go
@@ -12,7 +12,7 @@ import (
bloom "gitlab.com/elixxir/bloomfilter"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/cmixMessageBuffer.go b/cmix/cmixMessageBuffer.go
index cd9d54af2..86216a9c7 100644
--- a/cmix/cmixMessageBuffer.go
+++ b/cmix/cmixMessageBuffer.go
@@ -13,8 +13,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/cmixMessageBuffer_test.go b/cmix/cmixMessageBuffer_test.go
index 985b9c5cd..d6f227ef3 100644
--- a/cmix/cmixMessageBuffer_test.go
+++ b/cmix/cmixMessageBuffer_test.go
@@ -13,8 +13,8 @@ import (
"reflect"
"testing"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/critical.go b/cmix/critical.go
index b40bf26a3..c7a4d6c31 100644
--- a/cmix/critical.go
+++ b/cmix/critical.go
@@ -14,8 +14,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/health"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ds "gitlab.com/elixxir/comms/network/dataStructures"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/states"
diff --git a/cmix/critical_test.go b/cmix/critical_test.go
index e540e4675..6bf67a3eb 100644
--- a/cmix/critical_test.go
+++ b/cmix/critical_test.go
@@ -11,8 +11,8 @@ import (
"testing"
"time"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/gateway/certChecker.go b/cmix/gateway/certChecker.go
index 6d23c0b41..53a69248e 100644
--- a/cmix/gateway/certChecker.go
+++ b/cmix/gateway/certChecker.go
@@ -16,7 +16,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/hash"
"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/gateway/certChecker_test.go b/cmix/gateway/certChecker_test.go
index fe0e21668..d7c3d4b98 100644
--- a/cmix/gateway/certChecker_test.go
+++ b/cmix/gateway/certChecker_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/comms/testkeys"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/gateway/hostPool.go b/cmix/gateway/hostPool.go
index 71fa1860e..11fbb1108 100644
--- a/cmix/gateway/hostPool.go
+++ b/cmix/gateway/hostPool.go
@@ -17,9 +17,9 @@ import (
"github.com/golang-collections/collections/set"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
commNetwork "gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/comms/connect"
diff --git a/cmix/gateway/storeHostList.go b/cmix/gateway/storeHostList.go
index 65d0e25b8..10b9531e7 100644
--- a/cmix/gateway/storeHostList.go
+++ b/cmix/gateway/storeHostList.go
@@ -11,7 +11,7 @@ import (
"bytes"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/cmix/identity/receptionID/identity.go b/cmix/identity/receptionID/identity.go
index 8af1cd318..c3e75a49e 100644
--- a/cmix/identity/receptionID/identity.go
+++ b/cmix/identity/receptionID/identity.go
@@ -16,7 +16,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/identity/receptionID/identity_test.go b/cmix/identity/receptionID/identity_test.go
index 8822a89a7..522cea6c0 100644
--- a/cmix/identity/receptionID/identity_test.go
+++ b/cmix/identity/receptionID/identity_test.go
@@ -8,7 +8,7 @@
package receptionID
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/identity/receptionID/registration.go b/cmix/identity/receptionID/registration.go
index 312d52210..099953d5f 100644
--- a/cmix/identity/receptionID/registration.go
+++ b/cmix/identity/receptionID/registration.go
@@ -11,7 +11,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID/store"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/identity/receptionID/registration_test.go b/cmix/identity/receptionID/registration_test.go
index 5e5ae2e3b..e8c7684d3 100644
--- a/cmix/identity/receptionID/registration_test.go
+++ b/cmix/identity/receptionID/registration_test.go
@@ -8,7 +8,7 @@
package receptionID
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
"math/rand"
diff --git a/cmix/identity/receptionID/store.go b/cmix/identity/receptionID/store.go
index eea99ab0f..dabb1c1a1 100644
--- a/cmix/identity/receptionID/store.go
+++ b/cmix/identity/receptionID/store.go
@@ -11,7 +11,7 @@ import (
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/crypto/large"
"gitlab.com/xx_network/crypto/shuffle"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/identity/receptionID/store/checkedRounds.go b/cmix/identity/receptionID/store/checkedRounds.go
index 3e6629b37..43ce8dcfe 100644
--- a/cmix/identity/receptionID/store/checkedRounds.go
+++ b/cmix/identity/receptionID/store/checkedRounds.go
@@ -12,8 +12,8 @@ import (
"encoding/binary"
"github.com/pkg/errors"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/cmix/identity/receptionID/store/checkedRounds_test.go b/cmix/identity/receptionID/store/checkedRounds_test.go
index 924b05244..d5d96e763 100644
--- a/cmix/identity/receptionID/store/checkedRounds_test.go
+++ b/cmix/identity/receptionID/store/checkedRounds_test.go
@@ -10,8 +10,8 @@ package store
import (
"container/list"
"encoding/binary"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"reflect"
diff --git a/cmix/identity/receptionID/store/earliestRound.go b/cmix/identity/receptionID/store/earliestRound.go
index 5ad3bbee9..a1a4387c1 100644
--- a/cmix/identity/receptionID/store/earliestRound.go
+++ b/cmix/identity/receptionID/store/earliestRound.go
@@ -12,7 +12,7 @@ import (
"sync"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/cmix/identity/receptionID/store/unknownRounds.go b/cmix/identity/receptionID/store/unknownRounds.go
index f59ed9df4..e4d09a18a 100644
--- a/cmix/identity/receptionID/store/unknownRounds.go
+++ b/cmix/identity/receptionID/store/unknownRounds.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/cmix/identity/receptionID/store/unknownRounds_test.go b/cmix/identity/receptionID/store/unknownRounds_test.go
index 6c45ab9bf..71704461d 100644
--- a/cmix/identity/receptionID/store/unknownRounds_test.go
+++ b/cmix/identity/receptionID/store/unknownRounds_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"encoding/json"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"reflect"
diff --git a/cmix/identity/receptionID/store_test.go b/cmix/identity/receptionID/store_test.go
index 9c477d4c2..85d8976d8 100644
--- a/cmix/identity/receptionID/store_test.go
+++ b/cmix/identity/receptionID/store_test.go
@@ -12,7 +12,7 @@ import (
"encoding/binary"
"encoding/json"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/hash"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/identity/tracker.go b/cmix/identity/tracker.go
index 1552c6676..af2e8a55c 100644
--- a/cmix/identity/tracker.go
+++ b/cmix/identity/tracker.go
@@ -19,9 +19,9 @@ import (
"gitlab.com/elixxir/client/v4/cmix/address"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/message/handler.go b/cmix/message/handler.go
index c24ab79c7..f8ffb5927 100644
--- a/cmix/message/handler.go
+++ b/cmix/message/handler.go
@@ -14,8 +14,8 @@ import (
"sync"
"time"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
jww "github.com/spf13/jwalterweatherman"
diff --git a/cmix/message/handler_test.go b/cmix/message/handler_test.go
index 00650bfda..d6a303bf4 100644
--- a/cmix/message/handler_test.go
+++ b/cmix/message/handler_test.go
@@ -13,8 +13,8 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/sih"
"gitlab.com/elixxir/ekv"
diff --git a/cmix/message/inProgress_test.go b/cmix/message/inProgress_test.go
index 7a61d80ef..bb7d6548b 100644
--- a/cmix/message/inProgress_test.go
+++ b/cmix/message/inProgress_test.go
@@ -10,8 +10,8 @@ package message
import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
diff --git a/cmix/message/meteredCmixMessageBuffer.go b/cmix/message/meteredCmixMessageBuffer.go
index 2e72cd9d9..19ad728ff 100644
--- a/cmix/message/meteredCmixMessageBuffer.go
+++ b/cmix/message/meteredCmixMessageBuffer.go
@@ -15,8 +15,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/states"
diff --git a/cmix/message/meteredCmixMessageBuffer_test.go b/cmix/message/meteredCmixMessageBuffer_test.go
index 2002df7ad..a83560ecf 100644
--- a/cmix/message/meteredCmixMessageBuffer_test.go
+++ b/cmix/message/meteredCmixMessageBuffer_test.go
@@ -11,8 +11,8 @@ import (
"bytes"
"encoding/json"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
diff --git a/cmix/nodes/interfaces.go b/cmix/nodes/interfaces.go
index b5edce689..fea5d8513 100644
--- a/cmix/nodes/interfaces.go
+++ b/cmix/nodes/interfaces.go
@@ -8,8 +8,8 @@
package nodes
import (
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/cmix/nodes/registrar.go b/cmix/nodes/registrar.go
index d8ef6493a..f304a88b8 100644
--- a/cmix/nodes/registrar.go
+++ b/cmix/nodes/registrar.go
@@ -17,8 +17,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/gateway"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/hash"
diff --git a/cmix/nodes/store.go b/cmix/nodes/store.go
index 04ef3ddf2..2867c07e3 100644
--- a/cmix/nodes/store.go
+++ b/cmix/nodes/store.go
@@ -11,7 +11,7 @@ import (
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/nodes/storeKey.go b/cmix/nodes/storeKey.go
index a38de9c44..db7b88c59 100644
--- a/cmix/nodes/storeKey.go
+++ b/cmix/nodes/storeKey.go
@@ -11,7 +11,7 @@ import (
"bytes"
"encoding/binary"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/cmix/nodes/utils_test.go b/cmix/nodes/utils_test.go
index 00fd104df..8e824fe35 100644
--- a/cmix/nodes/utils_test.go
+++ b/cmix/nodes/utils_test.go
@@ -13,9 +13,9 @@ import (
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/cmix/gateway"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
commNetwork "gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/cmix/pickup/store/store.go b/cmix/pickup/store/store.go
index 8a2e17b9e..457e52b8d 100644
--- a/cmix/pickup/store/store.go
+++ b/cmix/pickup/store/store.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/pickup/store/uncheckedRounds.go b/cmix/pickup/store/uncheckedRounds.go
index 6d56e04dd..48d99ac49 100644
--- a/cmix/pickup/store/uncheckedRounds.go
+++ b/cmix/pickup/store/uncheckedRounds.go
@@ -14,7 +14,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
diff --git a/cmix/pickup/store/uncheckedRounds_test.go b/cmix/pickup/store/uncheckedRounds_test.go
index 3590b9a67..078668cd8 100644
--- a/cmix/pickup/store/uncheckedRounds_test.go
+++ b/cmix/pickup/store/uncheckedRounds_test.go
@@ -10,7 +10,7 @@ package store
import (
"bytes"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/cmix/rounds/roundStorage.go b/cmix/rounds/roundStorage.go
index 3ad31addb..46dbcaef4 100644
--- a/cmix/rounds/roundStorage.go
+++ b/cmix/rounds/roundStorage.go
@@ -9,7 +9,7 @@ package rounds
import (
"github.com/golang/protobuf/proto"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/collective/collector.go b/collective/collector.go
index 65308d3de..5a4ac933d 100644
--- a/collective/collector.go
+++ b/collective/collector.go
@@ -15,7 +15,7 @@ import (
"sync/atomic"
"time"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
diff --git a/collective/instanceID_test.go b/collective/instanceID_test.go
index 1d848d435..4bd977d28 100644
--- a/collective/instanceID_test.go
+++ b/collective/instanceID_test.go
@@ -14,7 +14,7 @@ import (
"time"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
)
diff --git a/collective/kv.go b/collective/kv.go
index 26c4ed063..f14bd2aff 100644
--- a/collective/kv.go
+++ b/collective/kv.go
@@ -15,8 +15,8 @@ import (
"time"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
)
diff --git a/collective/kv_test.go b/collective/kv_test.go
index c799af383..c5ab2c273 100644
--- a/collective/kv_test.go
+++ b/collective/kv_test.go
@@ -16,8 +16,8 @@ import (
"time"
"github.com/stretchr/testify/require"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
)
diff --git a/collective/map.go b/collective/map.go
index b493dd310..29bed14da 100644
--- a/collective/map.go
+++ b/collective/map.go
@@ -4,7 +4,7 @@ import (
"encoding/json"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"os"
)
diff --git a/collective/synckv.go b/collective/synckv.go
index cd4bc9470..9775bdbdc 100644
--- a/collective/synckv.go
+++ b/collective/synckv.go
@@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
)
diff --git a/collective/synckv_test.go b/collective/synckv_test.go
index a6729f213..78d1f2ec6 100644
--- a/collective/synckv_test.go
+++ b/collective/synckv_test.go
@@ -15,8 +15,8 @@ import (
"math/rand"
"github.com/stretchr/testify/require"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/shuffle"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/randomness"
diff --git a/collective/testing.go b/collective/testing.go
index 72cbb6f77..f0b1bc8e6 100644
--- a/collective/testing.go
+++ b/collective/testing.go
@@ -10,7 +10,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/collective/transactionLog.go b/collective/transactionLog.go
index 3a8379c65..49828fad8 100644
--- a/collective/transactionLog.go
+++ b/collective/transactionLog.go
@@ -15,8 +15,8 @@ import (
"sync/atomic"
"time"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/storage/versioned/kv.go b/collective/versioned/kv.go
similarity index 100%
rename from storage/versioned/kv.go
rename to collective/versioned/kv.go
diff --git a/storage/versioned/kv_test.go b/collective/versioned/kv_test.go
similarity index 100%
rename from storage/versioned/kv_test.go
rename to collective/versioned/kv_test.go
diff --git a/storage/versioned/mapSyntax.go b/collective/versioned/mapSyntax.go
similarity index 100%
rename from storage/versioned/mapSyntax.go
rename to collective/versioned/mapSyntax.go
diff --git a/storage/versioned/object.go b/collective/versioned/object.go
similarity index 100%
rename from storage/versioned/object.go
rename to collective/versioned/object.go
diff --git a/storage/versioned/object_test.go b/collective/versioned/object_test.go
similarity index 100%
rename from storage/versioned/object_test.go
rename to collective/versioned/object_test.go
diff --git a/dm/client.go b/dm/client.go
index a7d0c21cf..bc7091174 100644
--- a/dm/client.go
+++ b/dm/client.go
@@ -20,7 +20,7 @@ import (
"gitlab.com/xx_network/primitives/id"
"gitlab.com/elixxir/client/v4/cmix/identity"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/nike"
"gitlab.com/elixxir/crypto/nike/ecdh"
)
diff --git a/dm/client_test.go b/dm/client_test.go
index 807b61d46..31d55b381 100644
--- a/dm/client_test.go
+++ b/dm/client_test.go
@@ -12,7 +12,7 @@ import (
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/cmix"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/codename"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/nike/ecdh"
diff --git a/dm/dm_test.go b/dm/dm_test.go
index 0f5fdf126..a28e88e44 100644
--- a/dm/dm_test.go
+++ b/dm/dm_test.go
@@ -15,7 +15,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/cmix"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/codename"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/dm/sendTracker.go b/dm/sendTracker.go
index 22dd5600f..70b9b4af2 100644
--- a/dm/sendTracker.go
+++ b/dm/sendTracker.go
@@ -21,7 +21,7 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
"gitlab.com/elixxir/primitives/states"
diff --git a/dm/sendTracker_test.go b/dm/sendTracker_test.go
index ad9a68045..2dcca67e5 100644
--- a/dm/sendTracker_test.go
+++ b/dm/sendTracker_test.go
@@ -17,7 +17,7 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/codename"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/message"
diff --git a/e2e/critical.go b/e2e/critical.go
index e027b9a1b..b34306358 100644
--- a/e2e/critical.go
+++ b/e2e/critical.go
@@ -14,8 +14,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/v4/cmix"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ds "gitlab.com/elixxir/comms/network/dataStructures"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/elixxir/primitives/states"
diff --git a/e2e/e2eMessageBuffer.go b/e2e/e2eMessageBuffer.go
index 0427753d9..a64ae6c7f 100644
--- a/e2e/e2eMessageBuffer.go
+++ b/e2e/e2eMessageBuffer.go
@@ -13,8 +13,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
"golang.org/x/crypto/blake2b"
diff --git a/e2e/e2eMessageBuffer_test.go b/e2e/e2eMessageBuffer_test.go
index e2166aa25..6a1569361 100644
--- a/e2e/e2eMessageBuffer_test.go
+++ b/e2e/e2eMessageBuffer_test.go
@@ -11,8 +11,8 @@ import (
"encoding/json"
"gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/v4/cmix"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"reflect"
diff --git a/e2e/manager.go b/e2e/manager.go
index 13f1d9ea3..46107a9c4 100644
--- a/e2e/manager.go
+++ b/e2e/manager.go
@@ -22,13 +22,13 @@ import (
"gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/parse"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
"gitlab.com/elixxir/client/v4/e2e/receive"
"gitlab.com/elixxir/client/v4/e2e/rekey"
"gitlab.com/elixxir/client/v4/event"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/parse/conversation/partner.go b/e2e/parse/conversation/partner.go
index 01485bfec..1c6714d5d 100644
--- a/e2e/parse/conversation/partner.go
+++ b/e2e/parse/conversation/partner.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/e2e/parse/conversation/partner_test.go b/e2e/parse/conversation/partner_test.go
index e9368961d..491a04911 100644
--- a/e2e/parse/conversation/partner_test.go
+++ b/e2e/parse/conversation/partner_test.go
@@ -12,7 +12,7 @@ import (
"reflect"
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/e2e/parse/conversation/ring.go b/e2e/parse/conversation/ring.go
index 3a7a815ec..91006953b 100644
--- a/e2e/parse/conversation/ring.go
+++ b/e2e/parse/conversation/ring.go
@@ -15,7 +15,7 @@ import (
"time"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/e2e/parse/conversation/ring_test.go b/e2e/parse/conversation/ring_test.go
index 63ac30d36..0f001a311 100644
--- a/e2e/parse/conversation/ring_test.go
+++ b/e2e/parse/conversation/ring_test.go
@@ -9,7 +9,7 @@ package conversation
import (
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"reflect"
"strconv"
diff --git a/e2e/parse/conversation/store.go b/e2e/parse/conversation/store.go
index a6dd7d227..3927ee8bc 100644
--- a/e2e/parse/conversation/store.go
+++ b/e2e/parse/conversation/store.go
@@ -11,7 +11,7 @@ import (
"sync"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
)
diff --git a/e2e/parse/conversation/store_test.go b/e2e/parse/conversation/store_test.go
index 68ee8e2ba..aebaa12a3 100644
--- a/e2e/parse/conversation/store_test.go
+++ b/e2e/parse/conversation/store_test.go
@@ -8,7 +8,7 @@
package conversation
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"math/rand"
diff --git a/e2e/parse/partition.go b/e2e/parse/partition.go
index bb44609c9..f9134df69 100644
--- a/e2e/parse/partition.go
+++ b/e2e/parse/partition.go
@@ -13,10 +13,10 @@ import (
"github.com/pkg/errors"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/parse/conversation"
"gitlab.com/elixxir/client/v4/e2e/parse/partition"
"gitlab.com/elixxir/client/v4/e2e/receive"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/e2e/parse/partition/multiPartMessage.go b/e2e/parse/partition/multiPartMessage.go
index 96840192f..a2d99433a 100644
--- a/e2e/parse/partition/multiPartMessage.go
+++ b/e2e/parse/partition/multiPartMessage.go
@@ -16,8 +16,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/receive"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/parse/partition/multiPartMessage_test.go b/e2e/parse/partition/multiPartMessage_test.go
index 182137a7c..5ded9d207 100644
--- a/e2e/parse/partition/multiPartMessage_test.go
+++ b/e2e/parse/partition/multiPartMessage_test.go
@@ -11,8 +11,8 @@ import (
"bytes"
"encoding/json"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/receive"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/parse/partition/part.go b/e2e/parse/partition/part.go
index 215c4019b..53c00924f 100644
--- a/e2e/parse/partition/part.go
+++ b/e2e/parse/partition/part.go
@@ -8,7 +8,7 @@
package partition
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
"strconv"
)
diff --git a/e2e/parse/partition/part_test.go b/e2e/parse/partition/part_test.go
index 5d4a5889f..710dd4889 100644
--- a/e2e/parse/partition/part_test.go
+++ b/e2e/parse/partition/part_test.go
@@ -9,7 +9,7 @@ package partition
import (
"bytes"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
"math/rand"
diff --git a/e2e/parse/partition/store.go b/e2e/parse/partition/store.go
index 19a962652..2d578730f 100644
--- a/e2e/parse/partition/store.go
+++ b/e2e/parse/partition/store.go
@@ -16,8 +16,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/receive"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/parse/partition/store_test.go b/e2e/parse/partition/store_test.go
index d91b51936..f6d7bc6b8 100644
--- a/e2e/parse/partition/store_test.go
+++ b/e2e/parse/partition/store_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/catalog"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/e2e"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/parse/partition_test.go b/e2e/parse/partition_test.go
index cf9900e5a..a4276e280 100644
--- a/e2e/parse/partition_test.go
+++ b/e2e/parse/partition_test.go
@@ -12,7 +12,7 @@ import (
"testing"
"gitlab.com/elixxir/client/v4/catalog"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/e2e/ratchet/partner/manager.go b/e2e/ratchet/partner/manager.go
index f55b2645c..dd164ef17 100644
--- a/e2e/ratchet/partner/manager.go
+++ b/e2e/ratchet/partner/manager.go
@@ -16,9 +16,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/relationship.go b/e2e/ratchet/partner/relationship.go
index 3a5331362..dd177ae02 100644
--- a/e2e/ratchet/partner/relationship.go
+++ b/e2e/ratchet/partner/relationship.go
@@ -14,8 +14,8 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/partner/relationshipFingerprint.go b/e2e/ratchet/partner/relationshipFingerprint.go
index dd651545c..0ba355f32 100644
--- a/e2e/ratchet/partner/relationshipFingerprint.go
+++ b/e2e/ratchet/partner/relationshipFingerprint.go
@@ -9,8 +9,8 @@ package partner
import (
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/e2e"
diff --git a/e2e/ratchet/partner/relationship_test.go b/e2e/ratchet/partner/relationship_test.go
index 2fc5f85fb..26df47aa6 100644
--- a/e2e/ratchet/partner/relationship_test.go
+++ b/e2e/ratchet/partner/relationship_test.go
@@ -12,9 +12,9 @@ import (
"testing"
"github.com/cloudflare/circl/dh/sidh"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/session/session.go b/e2e/ratchet/partner/session/session.go
index e95165216..653eb0d2c 100644
--- a/e2e/ratchet/partner/session/session.go
+++ b/e2e/ratchet/partner/session/session.go
@@ -19,8 +19,8 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/session/testUtils.go b/e2e/ratchet/partner/session/testUtils.go
index d5ac95c11..09d2b7d42 100644
--- a/e2e/ratchet/partner/session/testUtils.go
+++ b/e2e/ratchet/partner/session/testUtils.go
@@ -13,8 +13,8 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/partner/utils_test.go b/e2e/ratchet/partner/utils_test.go
index 6af81d3f8..935cf17f4 100644
--- a/e2e/ratchet/partner/utils_test.go
+++ b/e2e/ratchet/partner/utils_test.go
@@ -13,9 +13,9 @@ import (
"testing"
"github.com/cloudflare/circl/dh/sidh"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/ratchet.go b/e2e/ratchet/ratchet.go
index 573eab3f0..458142b67 100644
--- a/e2e/ratchet/ratchet.go
+++ b/e2e/ratchet/ratchet.go
@@ -14,10 +14,10 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/e2e/ratchet/ratchet_test.go b/e2e/ratchet/ratchet_test.go
index 8e9f22875..84e950833 100644
--- a/e2e/ratchet/ratchet_test.go
+++ b/e2e/ratchet/ratchet_test.go
@@ -16,9 +16,9 @@ import (
"testing"
"github.com/cloudflare/circl/dh/sidh"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/ekv"
diff --git a/e2e/ratchet/storage.go b/e2e/ratchet/storage.go
index 5de0a8e2f..efd801d20 100644
--- a/e2e/ratchet/storage.go
+++ b/e2e/ratchet/storage.go
@@ -13,10 +13,10 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/xx_network/primitives/id"
diff --git a/e2e/ratchet/utils_test.go b/e2e/ratchet/utils_test.go
index 125023fea..da3e0e466 100644
--- a/e2e/ratchet/utils_test.go
+++ b/e2e/ratchet/utils_test.go
@@ -18,10 +18,10 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/confirm_test.go b/e2e/rekey/confirm_test.go
index 114a82ddb..0de5a0807 100644
--- a/e2e/rekey/confirm_test.go
+++ b/e2e/rekey/confirm_test.go
@@ -14,11 +14,11 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/e2e/receive"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/exchange_test.go b/e2e/rekey/exchange_test.go
index b65f9fac8..b80ef3d6c 100644
--- a/e2e/rekey/exchange_test.go
+++ b/e2e/rekey/exchange_test.go
@@ -16,11 +16,11 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/e2e/receive"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/e2e/rekey/trigger_test.go b/e2e/rekey/trigger_test.go
index 8cf5888eb..94b4321b9 100644
--- a/e2e/rekey/trigger_test.go
+++ b/e2e/rekey/trigger_test.go
@@ -15,12 +15,12 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/golang/protobuf/proto"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
session2 "gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
"gitlab.com/elixxir/client/v4/e2e/receive"
"gitlab.com/elixxir/client/v4/stoppable"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/e2e/sendE2E_test.go b/e2e/sendE2E_test.go
index 7f6b0c593..b145669f1 100644
--- a/e2e/sendE2E_test.go
+++ b/e2e/sendE2E_test.go
@@ -12,6 +12,7 @@ import (
"github.com/cloudflare/circl/dh/sidh"
"github.com/pkg/errors"
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/parse"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
@@ -19,7 +20,6 @@ import (
"gitlab.com/elixxir/client/v4/e2e/rekey"
"gitlab.com/elixxir/client/v4/stoppable"
util "gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/e2e"
diff --git a/e2e/sendUnsafe_test.go b/e2e/sendUnsafe_test.go
index b9d87c15f..25dbb005c 100644
--- a/e2e/sendUnsafe_test.go
+++ b/e2e/sendUnsafe_test.go
@@ -9,11 +9,11 @@ package e2e
import (
"gitlab.com/elixxir/client/v4/catalog"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/parse"
"gitlab.com/elixxir/client/v4/e2e/ratchet"
"gitlab.com/elixxir/client/v4/e2e/receive"
"gitlab.com/elixxir/client/v4/e2e/rekey"
- "gitlab.com/elixxir/client/v4/storage/versioned"
dh "gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go
index 8067c2d93..d3423fcd4 100644
--- a/fileTransfer/connect/utils_test.go
+++ b/fileTransfer/connect/utils_test.go
@@ -20,13 +20,13 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/receive"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go
index b883a32c0..f1f0a7cd1 100644
--- a/fileTransfer/e2e/utils_test.go
+++ b/fileTransfer/e2e/utils_test.go
@@ -20,6 +20,7 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
@@ -27,7 +28,6 @@ import (
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
userStorage "gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go
index e842fd87e..10ddf6278 100644
--- a/fileTransfer/groupChat/utils_test.go
+++ b/fileTransfer/groupChat/utils_test.go
@@ -18,12 +18,12 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/groupChat"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go
index 28f0876c8..f17f7c165 100644
--- a/fileTransfer/manager.go
+++ b/fileTransfer/manager.go
@@ -14,13 +14,13 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/fileTransfer/callbackTracker"
"gitlab.com/elixxir/client/v4/fileTransfer/store"
"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/fileTransfer/store/cypher/manager.go b/fileTransfer/store/cypher/manager.go
index ad3218462..1e392772e 100644
--- a/fileTransfer/store/cypher/manager.go
+++ b/fileTransfer/store/cypher/manager.go
@@ -9,8 +9,8 @@ package cypher
import (
"github.com/pkg/errors"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/fileTransfer/store/cypher/manager_test.go b/fileTransfer/store/cypher/manager_test.go
index 4d34d0e2c..8f28a5df3 100644
--- a/fileTransfer/store/cypher/manager_test.go
+++ b/fileTransfer/store/cypher/manager_test.go
@@ -13,8 +13,8 @@ import (
"testing"
"github.com/stretchr/testify/require"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/received.go b/fileTransfer/store/received.go
index b252f9081..169528be5 100644
--- a/fileTransfer/store/received.go
+++ b/fileTransfer/store/received.go
@@ -13,7 +13,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/fileTransfer/store/receivedTransfer.go b/fileTransfer/store/receivedTransfer.go
index 5f2ced9cc..3119e9338 100644
--- a/fileTransfer/store/receivedTransfer.go
+++ b/fileTransfer/store/receivedTransfer.go
@@ -16,9 +16,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/fileTransfer/store/receivedTransfer_test.go b/fileTransfer/store/receivedTransfer_test.go
index 6b4d3beae..a996dd835 100644
--- a/fileTransfer/store/receivedTransfer_test.go
+++ b/fileTransfer/store/receivedTransfer_test.go
@@ -14,9 +14,9 @@ import (
"testing"
"github.com/stretchr/testify/require"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/received_test.go b/fileTransfer/store/received_test.go
index cf2ccaa7b..83b28e0e5 100644
--- a/fileTransfer/store/received_test.go
+++ b/fileTransfer/store/received_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"fmt"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/store/sent.go b/fileTransfer/store/sent.go
index f3f7d3395..9e8087a7d 100644
--- a/fileTransfer/store/sent.go
+++ b/fileTransfer/store/sent.go
@@ -13,7 +13,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/fileTransfer/store/sentTransfer.go b/fileTransfer/store/sentTransfer.go
index dfe4b0fa1..1cd323a41 100644
--- a/fileTransfer/store/sentTransfer.go
+++ b/fileTransfer/store/sentTransfer.go
@@ -15,9 +15,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/fileTransfer/store/sentTransfer_test.go b/fileTransfer/store/sentTransfer_test.go
index 5aad2267d..eb883b630 100644
--- a/fileTransfer/store/sentTransfer_test.go
+++ b/fileTransfer/store/sentTransfer_test.go
@@ -11,10 +11,10 @@ import (
"bytes"
"fmt"
"github.com/stretchr/testify/require"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/fileTransfer/store/cypher"
"gitlab.com/elixxir/client/v4/fileTransfer/store/fileMessage"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
diff --git a/fileTransfer/store/sent_test.go b/fileTransfer/store/sent_test.go
index 246d069cf..1a23159ed 100644
--- a/fileTransfer/store/sent_test.go
+++ b/fileTransfer/store/sent_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"fmt"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
ftCrypto "gitlab.com/elixxir/crypto/fileTransfer"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go
index 0718e176f..ddb16fb94 100644
--- a/fileTransfer/utils_test.go
+++ b/fileTransfer/utils_test.go
@@ -23,11 +23,11 @@ import (
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/message"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
userStorage "gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/network"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/groupChat/groupStore/group.go b/groupChat/groupStore/group.go
index 4d551f7fa..58006c007 100644
--- a/groupChat/groupStore/group.go
+++ b/groupChat/groupStore/group.go
@@ -15,7 +15,7 @@ import (
"time"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/group_test.go b/groupChat/groupStore/group_test.go
index c311fb345..87ecd7ba9 100644
--- a/groupChat/groupStore/group_test.go
+++ b/groupChat/groupStore/group_test.go
@@ -8,7 +8,7 @@
package groupStore
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/store.go b/groupChat/groupStore/store.go
index 25923f094..4993a8210 100644
--- a/groupChat/groupStore/store.go
+++ b/groupChat/groupStore/store.go
@@ -14,7 +14,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/groupStore/store_test.go b/groupChat/groupStore/store_test.go
index a13d98cf4..5c6310c5f 100644
--- a/groupChat/groupStore/store_test.go
+++ b/groupChat/groupStore/store_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"fmt"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/id"
diff --git a/groupChat/manager_test.go b/groupChat/manager_test.go
index b4cd58cb7..6fb75747e 100644
--- a/groupChat/manager_test.go
+++ b/groupChat/manager_test.go
@@ -11,9 +11,9 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
e2eImport "gitlab.com/elixxir/client/v4/e2e"
gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/group"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format"
diff --git a/groupChat/messenger_test.go b/groupChat/messenger_test.go
index 7fd78bb97..e3d8e0840 100644
--- a/groupChat/messenger_test.go
+++ b/groupChat/messenger_test.go
@@ -9,10 +9,10 @@ package groupChat
import (
"gitlab.com/elixxir/client/v4/cmix"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
clientE2E "gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/groupChat/session_test.go b/groupChat/session_test.go
index 0a2f43c62..d73682d14 100644
--- a/groupChat/session_test.go
+++ b/groupChat/session_test.go
@@ -10,9 +10,9 @@ package groupChat
import (
"time"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/rsa"
"gitlab.com/elixxir/ekv"
diff --git a/groupChat/utils_test.go b/groupChat/utils_test.go
index 3fcfc3d1c..8b69540d1 100644
--- a/groupChat/utils_test.go
+++ b/groupChat/utils_test.go
@@ -9,10 +9,10 @@ package groupChat
import (
"encoding/base64"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/event"
gs "gitlab.com/elixxir/client/v4/groupChat/groupStore"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/group"
diff --git a/notifications/manager.go b/notifications/manager.go
index 12b66195d..3048d8123 100644
--- a/notifications/manager.go
+++ b/notifications/manager.go
@@ -6,7 +6,7 @@ import (
"fmt"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/notifications/manager_test.go b/notifications/manager_test.go
index 6d0a2391f..30c3c3354 100644
--- a/notifications/manager_test.go
+++ b/notifications/manager_test.go
@@ -5,7 +5,7 @@ import (
"fmt"
"github.com/stretchr/testify/require"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/notifications/notifications.go b/notifications/notifications.go
index a263b39f0..e363f8563 100644
--- a/notifications/notifications.go
+++ b/notifications/notifications.go
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
notifCrypto "gitlab.com/elixxir/crypto/notifications"
"gitlab.com/xx_network/primitives/id"
diff --git a/storage/clientVersion/store.go b/storage/clientVersion/store.go
index edc0e4da0..9de13b1b2 100644
--- a/storage/clientVersion/store.go
+++ b/storage/clientVersion/store.go
@@ -12,7 +12,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/primitives/version"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/clientVersion/store_test.go b/storage/clientVersion/store_test.go
index eee5f3e9c..44e9a3f1a 100644
--- a/storage/clientVersion/store_test.go
+++ b/storage/clientVersion/store_test.go
@@ -9,7 +9,7 @@ package clientVersion
import (
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/version"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/storage/ndf.go b/storage/ndf.go
index 8f8f1809e..a22d14400 100644
--- a/storage/ndf.go
+++ b/storage/ndf.go
@@ -9,8 +9,8 @@ package storage
import (
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/ndf"
)
diff --git a/storage/regCode.go b/storage/regCode.go
index cee06e341..f58fe4201 100644
--- a/storage/regCode.go
+++ b/storage/regCode.go
@@ -10,7 +10,7 @@ package storage
import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/regStatus.go b/storage/regStatus.go
index 78d67b291..f1b3ad9fb 100644
--- a/storage/regStatus.go
+++ b/storage/regStatus.go
@@ -14,7 +14,7 @@ import (
jww "github.com/spf13/jwalterweatherman"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/session.go b/storage/session.go
index ed58e624b..604c0d017 100644
--- a/storage/session.go
+++ b/storage/session.go
@@ -23,9 +23,9 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/clientVersion"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/rsa"
"gitlab.com/elixxir/ekv"
diff --git a/storage/user/cryptographic.go b/storage/user/cryptographic.go
index ade79f20e..6a4499ac0 100644
--- a/storage/user/cryptographic.go
+++ b/storage/user/cryptographic.go
@@ -14,8 +14,8 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/utility"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/rsa"
oldRsa "gitlab.com/xx_network/crypto/signature/rsa"
diff --git a/storage/user/cryptographic_test.go b/storage/user/cryptographic_test.go
index f8769e962..a14fc6000 100644
--- a/storage/user/cryptographic_test.go
+++ b/storage/user/cryptographic_test.go
@@ -12,7 +12,7 @@ import (
"crypto/rand"
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/storage/user/registation.go b/storage/user/registation.go
index 5900f82a1..3e07dd8c0 100644
--- a/storage/user/registation.go
+++ b/storage/user/registation.go
@@ -10,7 +10,7 @@ package user
import (
"encoding/binary"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
"time"
)
diff --git a/storage/user/registation_test.go b/storage/user/registation_test.go
index 2e9366640..de80fbb5f 100644
--- a/storage/user/registation_test.go
+++ b/storage/user/registation_test.go
@@ -14,7 +14,7 @@ import (
"testing"
"time"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/storage/user/user.go b/storage/user/user.go
index d647b49be..2b977b87d 100644
--- a/storage/user/user.go
+++ b/storage/user/user.go
@@ -13,7 +13,7 @@ import (
"github.com/pkg/errors"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/rsa"
"gitlab.com/xx_network/primitives/id"
diff --git a/storage/user/user_test.go b/storage/user/user_test.go
index 0b0d33c76..a19125a84 100644
--- a/storage/user/user_test.go
+++ b/storage/user/user_test.go
@@ -12,7 +12,7 @@ import (
"math/rand"
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/storage/user/username.go b/storage/user/username.go
index 636f4e3d3..6c654b7d8 100644
--- a/storage/user/username.go
+++ b/storage/user/username.go
@@ -10,7 +10,7 @@ package user
import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/user/username_test.go b/storage/user/username_test.go
index 4824424ad..49439c2b0 100644
--- a/storage/user/username_test.go
+++ b/storage/user/username_test.go
@@ -11,7 +11,7 @@ import (
"math/rand"
"testing"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
"gitlab.com/elixxir/crypto/rsa"
diff --git a/storage/utility/NDF.go b/storage/utility/NDF.go
index 7830e9c14..7f05e9247 100644
--- a/storage/utility/NDF.go
+++ b/storage/utility/NDF.go
@@ -11,7 +11,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/ndf"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/NDF_js.go b/storage/utility/NDF_js.go
index 9de986cd0..29ee77c00 100644
--- a/storage/utility/NDF_js.go
+++ b/storage/utility/NDF_js.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/ndf"
)
diff --git a/storage/utility/blockStore.go b/storage/utility/blockStore.go
index 9665917af..05d6edb71 100644
--- a/storage/utility/blockStore.go
+++ b/storage/utility/blockStore.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/blockStore_test.go b/storage/utility/blockStore_test.go
index b519eda92..c2794f950 100644
--- a/storage/utility/blockStore_test.go
+++ b/storage/utility/blockStore_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"encoding/binary"
"fmt"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
"math/rand"
diff --git a/storage/utility/bucket.go b/storage/utility/bucket.go
index 05b1da34d..eb3d906df 100644
--- a/storage/utility/bucket.go
+++ b/storage/utility/bucket.go
@@ -12,7 +12,7 @@ import (
"time"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
"gitlab.com/xx_network/primitives/rateLimiting"
)
diff --git a/storage/utility/bucketParams.go b/storage/utility/bucketParams.go
index e518f45ed..9d060c474 100644
--- a/storage/utility/bucketParams.go
+++ b/storage/utility/bucketParams.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
"gitlab.com/xx_network/primitives/rateLimiting"
)
diff --git a/storage/utility/bucketParams_test.go b/storage/utility/bucketParams_test.go
index bfd4aa727..afbe3f391 100644
--- a/storage/utility/bucketParams_test.go
+++ b/storage/utility/bucketParams_test.go
@@ -9,7 +9,7 @@ package utility
import (
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"reflect"
"testing"
diff --git a/storage/utility/contact.go b/storage/utility/contact.go
index f7fefe1b7..3e324d9c2 100644
--- a/storage/utility/contact.go
+++ b/storage/utility/contact.go
@@ -10,7 +10,7 @@ package utility
import (
"fmt"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
diff --git a/storage/utility/dh.go b/storage/utility/dh.go
index 403e8f133..2f4f27960 100644
--- a/storage/utility/dh.go
+++ b/storage/utility/dh.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/dh_test.go b/storage/utility/dh_test.go
index d106c6d90..00adad4a4 100644
--- a/storage/utility/dh_test.go
+++ b/storage/utility/dh_test.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"testing"
)
diff --git a/storage/utility/encryptionSalt.go b/storage/utility/encryptionSalt.go
index c0c7c0acc..f4db315d0 100644
--- a/storage/utility/encryptionSalt.go
+++ b/storage/utility/encryptionSalt.go
@@ -4,7 +4,7 @@ import (
"io"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/encryptionSalt_test.go b/storage/utility/encryptionSalt_test.go
index 270136233..8231371be 100644
--- a/storage/utility/encryptionSalt_test.go
+++ b/storage/utility/encryptionSalt_test.go
@@ -2,7 +2,7 @@ package utility
import (
"bytes"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
"testing"
diff --git a/storage/utility/group.go b/storage/utility/group.go
index 1aeca4ee2..95b351c4e 100644
--- a/storage/utility/group.go
+++ b/storage/utility/group.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/group_test.go b/storage/utility/group_test.go
index ecc9f3cff..4e6acfaee 100644
--- a/storage/utility/group_test.go
+++ b/storage/utility/group_test.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/large"
diff --git a/storage/utility/id.go b/storage/utility/id.go
index 0e1c2a882..fdb60b1d7 100644
--- a/storage/utility/id.go
+++ b/storage/utility/id.go
@@ -8,7 +8,7 @@
package utility
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/messageBuffer.go b/storage/utility/messageBuffer.go
index b4c7f598a..699254871 100644
--- a/storage/utility/messageBuffer.go
+++ b/storage/utility/messageBuffer.go
@@ -13,7 +13,7 @@ import (
"sync"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/messageBuffer_test.go b/storage/utility/messageBuffer_test.go
index 02ac0e2f6..32b9b81b3 100644
--- a/storage/utility/messageBuffer_test.go
+++ b/storage/utility/messageBuffer_test.go
@@ -10,7 +10,7 @@ package utility
import (
"bytes"
"encoding/json"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
"golang.org/x/crypto/blake2b"
diff --git a/storage/utility/multiStateVector.go b/storage/utility/multiStateVector.go
index 908a0b241..b17a3c3c8 100644
--- a/storage/utility/multiStateVector.go
+++ b/storage/utility/multiStateVector.go
@@ -15,7 +15,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/multiStateVector_test.go b/storage/utility/multiStateVector_test.go
index 813861e3c..7c0830c2e 100644
--- a/storage/utility/multiStateVector_test.go
+++ b/storage/utility/multiStateVector_test.go
@@ -11,7 +11,7 @@ import (
"bytes"
"encoding/base64"
"fmt"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
"math"
diff --git a/storage/utility/sidh.go b/storage/utility/sidh.go
index 6e55b5b5e..368383f03 100644
--- a/storage/utility/sidh.go
+++ b/storage/utility/sidh.go
@@ -14,8 +14,8 @@ import (
"github.com/cloudflare/circl/dh/sidh"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
sidhinterface "gitlab.com/elixxir/client/v4/interfaces/sidh"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/sidh_test.go b/storage/utility/sidh_test.go
index 14bc95836..be98a6c72 100644
--- a/storage/utility/sidh_test.go
+++ b/storage/utility/sidh_test.go
@@ -9,7 +9,7 @@ package utility
import (
"github.com/cloudflare/circl/dh/sidh"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/csprng"
diff --git a/storage/utility/stateVector.go b/storage/utility/stateVector.go
index 6940130b2..cdbd103b4 100644
--- a/storage/utility/stateVector.go
+++ b/storage/utility/stateVector.go
@@ -18,7 +18,7 @@ import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/storage/utility/stateVector_test.go b/storage/utility/stateVector_test.go
index af697007e..c66e160d6 100644
--- a/storage/utility/stateVector_test.go
+++ b/storage/utility/stateVector_test.go
@@ -18,7 +18,7 @@ import (
"testing"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/ud/channelIDTracking.go b/ud/channelIDTracking.go
index 03173f68e..31d25d198 100644
--- a/ud/channelIDTracking.go
+++ b/ud/channelIDTracking.go
@@ -11,8 +11,8 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/channels"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/stoppable"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/channel"
diff --git a/ud/channelIDTracking_test.go b/ud/channelIDTracking_test.go
index a0ae57843..9bf020ff6 100644
--- a/ud/channelIDTracking_test.go
+++ b/ud/channelIDTracking_test.go
@@ -13,8 +13,8 @@ import (
"gitlab.com/xx_network/crypto/csprng"
"gitlab.com/xx_network/primitives/id"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
- "gitlab.com/elixxir/client/v4/storage/versioned"
store "gitlab.com/elixxir/client/v4/ud/store"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
diff --git a/ud/manager.go b/ud/manager.go
index 063ff6271..004193aa9 100644
--- a/ud/manager.go
+++ b/ud/manager.go
@@ -10,8 +10,8 @@ package ud
import (
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
- "gitlab.com/elixxir/client/v4/storage/versioned"
store "gitlab.com/elixxir/client/v4/ud/store"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/contact"
diff --git a/ud/mockE2e_test.go b/ud/mockE2e_test.go
index 763d8c051..f955c594b 100644
--- a/ud/mockE2e_test.go
+++ b/ud/mockE2e_test.go
@@ -12,6 +12,7 @@ import (
"gitlab.com/elixxir/client/v4/catalog"
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/message"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner"
"gitlab.com/elixxir/client/v4/e2e/ratchet/partner/session"
@@ -19,7 +20,6 @@ import (
"gitlab.com/elixxir/client/v4/event"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/xxdk"
"gitlab.com/elixxir/crypto/cyclic"
cryptoE2e "gitlab.com/elixxir/crypto/e2e"
diff --git a/ud/mockStore_test.go b/ud/mockStore_test.go
index 7b051c326..c686b60e1 100644
--- a/ud/mockStore_test.go
+++ b/ud/mockStore_test.go
@@ -10,9 +10,9 @@ package ud
import (
"time"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/rsa"
"gitlab.com/elixxir/ekv"
diff --git a/ud/registered.go b/ud/registered.go
index 6d766a477..b19670d31 100644
--- a/ud/registered.go
+++ b/ud/registered.go
@@ -11,7 +11,7 @@ import (
"encoding/binary"
jww "github.com/spf13/jwalterweatherman"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/ud/store/facts_test.go b/ud/store/facts_test.go
index fe3e2a85f..f5946eafc 100644
--- a/ud/store/facts_test.go
+++ b/ud/store/facts_test.go
@@ -8,7 +8,7 @@
package ud
import (
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/fact"
"reflect"
diff --git a/ud/store/store.go b/ud/store/store.go
index 4b1a0b3c6..a7a477960 100644
--- a/ud/store/store.go
+++ b/ud/store/store.go
@@ -14,7 +14,7 @@ import (
"sync"
"github.com/pkg/errors"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/primitives/fact"
"gitlab.com/xx_network/primitives/netTime"
)
diff --git a/ud/store/store_test.go b/ud/store/store_test.go
index 3102149ff..b0a9d2096 100644
--- a/ud/store/store_test.go
+++ b/ud/store/store_test.go
@@ -10,7 +10,7 @@ package ud
import (
"bytes"
"github.com/stretchr/testify/require"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/fact"
"reflect"
diff --git a/ud/utils_test.go b/ud/utils_test.go
index 9152dbec1..c7962c341 100644
--- a/ud/utils_test.go
+++ b/ud/utils_test.go
@@ -12,10 +12,10 @@ import (
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
"gitlab.com/elixxir/client/v4/single"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
store "gitlab.com/elixxir/client/v4/ud/store"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
diff --git a/xxdk/cmix.go b/xxdk/cmix.go
index 08732f25e..894c2fb3b 100644
--- a/xxdk/cmix.go
+++ b/xxdk/cmix.go
@@ -17,13 +17,13 @@ import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/cmix"
"gitlab.com/elixxir/client/v4/collective"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/event"
"gitlab.com/elixxir/client/v4/interfaces"
"gitlab.com/elixxir/client/v4/registration"
"gitlab.com/elixxir/client/v4/stoppable"
"gitlab.com/elixxir/client/v4/storage"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/comms/client"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/fastRNG"
diff --git a/xxdk/e2e.go b/xxdk/e2e.go
index db1abc672..babf5a443 100644
--- a/xxdk/e2e.go
+++ b/xxdk/e2e.go
@@ -16,10 +16,10 @@ import (
"gitlab.com/elixxir/client/v4/auth"
"gitlab.com/elixxir/client/v4/cmix/identity/receptionID"
"gitlab.com/elixxir/client/v4/cmix/rounds"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/e2e"
"gitlab.com/elixxir/client/v4/e2e/rekey"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/ekv"
"gitlab.com/xx_network/crypto/xx"
diff --git a/xxdk/identity.go b/xxdk/identity.go
index 29a3ad17d..f260b843c 100644
--- a/xxdk/identity.go
+++ b/xxdk/identity.go
@@ -11,8 +11,8 @@ import (
"encoding/json"
"gitlab.com/elixxir/primitives/fact"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/storage/user"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/elixxir/crypto/cyclic"
"gitlab.com/elixxir/crypto/diffieHellman"
diff --git a/xxdk/kv.go b/xxdk/kv.go
index 5d8a5e7cc..a6544c1e8 100644
--- a/xxdk/kv.go
+++ b/xxdk/kv.go
@@ -10,7 +10,7 @@ package xxdk
import (
"github.com/pkg/errors"
"gitlab.com/elixxir/client/v4/collective"
- "gitlab.com/elixxir/client/v4/storage/versioned"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/crypto/fastRNG"
"gitlab.com/elixxir/ekv"
)
diff --git a/xxmutils/restoreContacts.go b/xxmutils/restoreContacts.go
index 7f4fea4b5..8d1d9c6c1 100644
--- a/xxmutils/restoreContacts.go
+++ b/xxmutils/restoreContacts.go
@@ -21,9 +21,9 @@ import (
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/v4/collective/versioned"
"gitlab.com/elixxir/client/v4/interfaces"
"gitlab.com/elixxir/client/v4/storage"
- "gitlab.com/elixxir/client/v4/storage/versioned"
"gitlab.com/elixxir/client/v4/ud"
"gitlab.com/elixxir/crypto/contact"
"gitlab.com/xx_network/primitives/id"
--
GitLab