diff --git a/auth/state.go b/auth/state.go index a0f106952ac2d777717e6211f5a0401fa8aca53b..58fe47714f3fe2f4c26528bc6d19da416af8dd70 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 dc7cca105ebc8b482e2f595a649027bfc823b49f..1276c469b25adcec3c5d3a2d2935e849051936bb 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 4f1ca8963bd0b818d66425afe0193f0a844edfda..d28be36557427a4cbc58708f3e48dfe1a82aa8d6 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 b60f29f0a2d8f3d9149414bd9e4a2cd7e50c06b4..dd9cb17b9093fa8a8bae00a74214e88894badbe8 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 5941d4d545fff7528a564214fbe58de115f7b351..c70fdb50e9a7f0ce40d4e5d6e81f3c31f12cd58b 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 557a499113b472305fd1a76b75f53cb63e7e6063..84732a1daa547495f5d670af7b5f0a79359f6f7b 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 3bd07fdb3fdcc58571877812678f652dd9b782d4..f5cf95a558fe02476388dd2454c003a21cc9c9a2 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 18d9841dc70d78de081dc8433a8c5f545c20a64a..0965e4b7ab92b171a5e7f86cb69538e9d040e7e8 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 cca5b47abbc85b324658f27d60a312150440d93c..2485264d9ad4e158b60c4964fa555d2db16f06b8 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 b4538ee8785dd81035164d26015e5578039659b3..cbbfb145fd0cab37f65b1aef9c98161b6567da19 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 4399edadf9543c202e98457fdee1b193b9725033..ca1f9c30d2d13739b718dd2ebd15309fc8af032a 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 858f58f87b35ff5cba46b7f4142b7a2355cbfa3e..cdd6e856278a06ab643304be165def7df46cc11e 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 3403ecb46a3d36a9f2d7a523bfaf173d8121c9a0..0bf9d6fe668a8e0b8a1cce8ea66c20080762dcf5 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 02588ed20909c4014a1439c89d5b4937f78ed3e1..7437474dcdd828df39036c71492efc19f198f579 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 8d96e5b85538902def0b4d6625c1907494727894..fbb7e0f994c77efa1883c2f5606564a0bdbee3bb 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 80685200ebe198bf95df0c3d03eebe11254d76c6..6ce4f7807fe115c84ebf49e07e54245e0e9096dd 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 d39706fd8756476c7454b1867134b1275f1310d3..7629410328c84b1f65c0248b80f1076e5d0c1b69 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 4cb2258db37eb6eb99c10b789f557f9b6fca940e..35ff85ca24c03a85fff8050b68c95813a58d00f1 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 366f712fa17cc887c72c805e3d2363c476829e96..cbf10fa93ce1da83b45bc3dce713f0e54614593f 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 08883a424e7bf5d536c70a4e75cf5d33ae0d1310..44b699ef9cfd62fc27f28b1b3ec645c5329f22d1 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 4c5ff8664e7dd7a5067dfa664786151b419fe3aa..edb15ddb782cd5c581c672a474d19524924da327 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 5daa2433af043d3999342233101c328d2ab5d914..4e86e9ca8bbc040164f17b892d3c936333273b74 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 9a184d0bbba5b6dc884712d3280be95dd4be2b86..6df51995f58088ab4efab91444700a989a62e908 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 5a5decb68102fe319a53e19c2730ba8e4fae7810..cac1b0df73740770edc257855244c4d19250a568 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 9f5b87f382f4680241e96a20a67809045a4fc233..00bdd2757ab5cd2b2cfb11da6f64d346e74b7952 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 80520b856e63e2f46018337a34f638cab4810652..8b297cb18957f8af4a5aac648973d352983a19a7 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 a6487e049cfa44091100f1962e8e6baab3855bc8..e9e41c14102e0f2f5825e0cadd4e894201a9a970 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 cc38c56bb0c6b6bde9f931c2d63246fbc86b445c..bd6fc4171c006ddaca5d942a7495b2df53542b70 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 f40d1f6cbc36cc44e2c2f5312355fe95eb63dec1..bc07f444ad1180e622d9b74d41c71d65d3da91f5 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 1572489034cc7cecbe49dbf85895cad4612f1997..0b7763730a3833853a1b0027ff4a0661000edc00 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 b0876d8a80154727e182b370ac1da3665496fac8..bfc411e41cdc91c363aff36f1ff301aae216e156 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 33a1486b40c9a3c1c810d97bc6c0a77a9609bd82..33dad6ef6b7b4c2e85682a18a5030703aa738a94 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 af42e20479bd1ce12fd8f9979d63db4b701ad3f8..5ace4749edee3c3448afbfb991c7f0ac915d06a2 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 b77ff414155e38394528438de9d93d53ab070c8f..42e3ec84f628936dbc797432d060e4eb0de73b1e 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 58b26b2e68fc16d3f37e3b1c80f609246e699358..89e899c1cd273046a49d37028ca46faeb4b119c5 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 b44bd4f97f0fb33a31551806970d65617daab0d7..b4348b5f04e824fa76d2a17c825d729de19ef5a4 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 c7d66d9a5635bb0a25d633fc07d7627fbcfce825..772658ae06b9093a52a6fe3de1e325e49195c561 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 4dde35598aac7c41ec79be45e453058f9adebc53..46610a27938c8f7154e3e32777a8d045f99ef3fe 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 ba583989cf5d98327ae36d2022cde918930148bf..08e0d05b8ac1f1db5e1f6d157c6f0edc969fac8a 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 e334bf3d5a4d58722b77c22965b78fdb6fce0ecb..0e1a15c5fdef82fbe061b661316c73402db61cdc 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 77c1ca62bf56213cb52cb4dca91b4e4f5046944c..9c21a5ee3c1d627ce35b201a7bb9dd8aa1f462b0 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 1a52e290c42964af5d099445f296efacecaf233e..f7cd3b9bb47459ce8a96f9dd89ad8471a33cd6c6 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 141ce675d99238df1ae0ed338189a4bb7b456606..33d0d70d10c44b33598dbcd5256ba08442f0e485 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 31dacb7aa823bca299bf6dcb46ee3fa79fc9d7dd..a3e13a16a49d082e797637392ca86604a02f5857 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 1933e1630a35c6122732b4ec9dc097dcc9b3cf82..350b0805dd05083e874ce16d391e298d0f04f420 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 f5e231c65cb13429c6632dc6358c3e8e2b95ee79..de30dcb9e7a0b5296452cf1e7fa2565082876fe4 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 498a427cbf2b7a702bc4baaba954ab101fe3c1e5..c80c1708a358b1d1dcd88e1ce9b81603cb6fa882 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 ed1fa78db6b8c23551177cce4929ece7b0cf0ae7..00f63263373c00aa6cc7803dd268f80afcc44b65 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 7d1ae40bcc69df43f88b85cdfc6e959ebc4b1f41..6930ef302ee586e2a163689a9e599fbaa93ee712 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 c4957dc57c7711ae734fc9a165698972a0dae3cc..5f4a9c5a24b4050a1b39355d0e6362571546daf7 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 9140b27cb8e25e8f58c7ff91630a74d8dbaa3eeb..e953a0d44813ba4921a749cb76804bcdb1063f52 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 68920cad3bc41f3426703a0d748a505d9079bc61..ff411f675503cf0c22c7eb664f4e527347969cf6 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 602fe1df4e0aa172d83a80b3818d847d6f580e04..bdde8de9b23cc6866730c576d935b5a32bbefab7 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 5aa38bef51e5ba87322cb9d86f8d232f9b27ec5e..afd1b6e51b93e489d43bbefe47079dff96653b36 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 12b72bd146baa5b10fcec22fe802ac4fa891fbac..f7c5ea12ccf495eda74e27acdb779093dc457a5d 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 cd9d54af2191bea0d40dc0881f0b2be34bcaf235..86216a9c73981dbe966b6d646e5f1bbfe5626c44 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 985b9c5cdedaf732692f307177d0275a3e57d638..d6f227ef3652f29c0f7455816d50a1ee5a04e9cc 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 b40bf26a3e0f1a2ddb1308ed0ded885f93e6f299..c7a4d6c31c8530dcb9ea80ae5e6e53223fcc1b95 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 e540e46756ef1b5f492ffd922e488e7e41f0e5cd..6bf67a3eb4765a13e2ef264eaa22b7b60fe05af2 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 6d23c0b410d42df6051f763af8fa4727b5925407..53a69248edb1bb3300b2735575f0885a03271f32 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 fe0e216688fa02dbe76bc48faba8d320c884efd3..d7c3d4b98c1560e37fd1ad8bddd2b01761c1fda6 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 71fa1860e1e63ba777864af371f9118fac2ab391..11fbb11086a2ae7c2c9e9ce006db0e607e18d1e0 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 65d0e25b8ada0f846ddb69174b436a8570a58b33..10b9531e7e244aaa401c99af1ce3d6a8d9a03e0c 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 8af1cd318f910ca132b6a012bc9fd66f7da5e033..c3e75a49e4749288d521f4a4598ff902821337b7 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 8822a89a73a7b2ba3e85e043bf0b6ee83506caea..522cea6c04bbcf7368380bdcf9a5b0cc855b40bf 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 312d5221006a4c2a30bbd13c3b7196c6f6a22fb6..099953d5fc31dccb53979bbdc678885c6abd9566 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 5e5ae2e3b08bbe10ddc37d170a39149a5ad07f41..e8c7684d31e7de7655eca9aa8753e0663a476558 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 eea99ab0f1617afe84ef733cde7cd03eabc2ca01..dabb1c1a1ba5c88f2d9988280932331f865c5275 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 3e6629b371782768e8061b8d3c69bafa2022cd17..43ce8dcfe464725ae62eb1fc686939945d8aac73 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 924b052441da26cbd95132a9be295df13d1df8c4..d5d96e763832c117f673c3d8203c0dadc9bba61d 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 5ad3bbee960176091382ed9c18eccf2d8195a17d..a1a4387c12e567bded0f2a37099469c506751a7a 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 f59ed9df49ac587c898f1e71917ec47806069ba5..e4d09a18a9e2f858d64343d078c60b66de161be5 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 6c45ab9bfe5f80bb943e27136707d714a2f2ef37..71704461d692cc6ab30e7ac79db4f5d3ee4e7089 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 9c477d4c2161ec1527a124b35f7653ff7f7ba7b9..85d8976d8579700205675e359b756a7225312e89 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 1552c66761c4b1df48bf8795c68e279a587af3cf..af2e8a55ce523863e34a28e5daa3691197a41f95 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 c24ab79c71c7107b2d4bc73706856122c61b950d..f8ffb59277a95df35e2645f9d13eb5b2bc52b421 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 00650bfda945f3bef048a6d329379f995b910678..d6a303bf46170faf5d1da830edb1891902d5ab74 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 7a61d80efe9824876fc7446451560a25288666f8..bb7d6548b76d77c95a393e4b7621d38ba55b3f4e 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 2e72cd9d9ed2e6a1235236aeb0215bb0cca1c297..19ad728ff417806db31f5907669457aaaec7f8d4 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 2002df7ad9e90c106eff0450d23ba8559507ae50..a83560ecf9d547d0070f217ccf1010faaa3bb585 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 b5edce6892639ce1b744c8ad1f92c44994705628..fea5d85135f16271af199fcd02fa08d533d59dba 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 d8ef6493a48e65bd95ffc164f0fb6a44ba62b29b..f304a88b8fba161e411e01f33595b78698c719a9 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 04ef3ddf25da78c4cb21b296bbdbbd7ef12f9c4a..2867c07e3e0ec8b7e766b8c20053df862900ca29 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 a38de9c44635bd959535894377c130f41bca84c7..db7b88c5995d46506fe270ea6316c694e7282d14 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 00fd104df0ad5227647eefba4f1045f14ee23866..8e824fe3517fa4b68436657468979f62fcbb29b6 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 8a2e17b9e9bdad8ca86eb16c843cc30ae6867e57..457e52b8de7e29a306d920320feab28d3f7b6453 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 6d56e04dde354e1cc8f6d974eddc82139d1db023..48d99ac495755e95e29ca61d120dc2a300511acb 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 3590b9a67919801b831fe74430b1a32c8d431774..078668cd89eb218516de78e8b50130390a27b9fa 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 3ad31addb73774a5fdb98985496402a009555b8f..46dbcaef4a30835ff40366956268921b4f8cd4c3 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 65308d3de8903f610eb954cebc8993ba7e14631d..5a4ac933d48a36660dc7ed3964baa35aca1e82fc 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 1d848d4350dd0f686b2d45281447816bcd1b8991..4bd977d28c415876428554e45257eac8ae7cad84 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 26c4ed063f73dc5774ad588c06c99f8142fffced..f14bd2afff401abd01abd8fa01eeabfc4db327fc 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 c799af383fea823f6ddadd05d262d95b815c6694..c5ab2c27358c61495598ee4336d8f3421766e13f 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 b493dd310260ee4695c40c7633252a2586a3d378..29bed14da0efab87a4eb72552742b2de00191898 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 cd4bc9470df2affdf99041ac792c6b0e71ab21f2..9775bdbdc1746b60360d1f504cc87e0189ea2ed4 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 a6729f213240f3e03fe2c4a3e01506e86ee0436c..78d1f2ec6dec337f426f7af7c65fd7c6d35d284c 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 72cbb6f7762cbb4571b59f489d2a8ca9094b25d1..f0b1bc8e64af1f9eca3f77726911e644582e1b8a 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 3a8379c656a7541bbcafa520551cd2ca4743b873..49828fad8c0f32f0c7c03718f246353a5a391fc7 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 a7d0c21cf995ced5cab16aaf90eb7bac38a481d6..bc7091174ada347a0ba370d44ce6201ad22a287b 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 807b61d46c4f5c647a90da123f18bf93348657a9..31d55b381a6c827d47497e7c15486b08ad48a12c 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 0f5fdf12694b2a57b76980d0e806ab0a1a223d21..a28e88e4488542f71396fa4621cc5a5e0f883106 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 22dd5600f5a021d0ea92c6396874c97c34637d42..70b9b4af2f78efa4852c3e18bd6a7c6092262f6c 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 ad9a6804592dcbbf2d159cb87dce20e8f030e1c5..2dcca67e53a93335b53e7b4542b60f0d573b7d79 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 e027b9a1b954054fdb69761f6e127f3497705e24..b343063580b0c7dab36625f7c4d37509be45a373 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 0427753d91aab7965977980dc69d24de5ad0c129..a64ae6c7f5e0771d960f15e46571fc3f71a214d4 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 e2166aa25b6b0b1a987401ba6cc8198c37c3e43e..6a15693619e333d2cfa14deb553bb4cedcd2a8cd 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 13f1d9ea309360b87ac1c7e15ced325bb46aa477..46107a9c4bafcd8431faa9b48a0693d797dc369e 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 01485bfec6695a41d0ad8e77386826c2fb6fad42..1c6714d5d67e8abfcbc6897fbabb0f26eb4caaa0 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 e9368961d0586f0fc50ed2aa1063229232d4258d..491a04911ff293c916b862e0592d0da20140f7aa 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 3a7a815ec82a8818fe3af511ec658c583b9050d3..91006953ba439ff0e6b6f0a626089a911c4f7d04 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 63ac30d3622c0b819b7be4142915fe74952f8890..0f001a3116c6130abbbfcf77b2dad0716b86cd36 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 a6dd7d22703a1580e2e4fa4f4d5ad41c275a2bdb..3927ee8bc689b130c7aa22a642798b13bf1b5aec 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 68ee8e2ba1b73b550d55244afce6715e7a19d612..aebaa12a314652f01a9f185b5380f1e2a1898617 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 bb44609c9ca4f402a975f3df7ab67a8d9ddbdd18..f9134df696c4dc70b5cfa9f44b37d9c4e98aedc2 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 96840192f297aa5acb1ba879fdc4ec372bca6f0c..a2d99433aab0ba02fa495a51d00fd51a358358a8 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 182137a7cd164befb19c2abf89c6f063f21db81e..5ded9d207d477eeb4423cd3be18e96c57da9d049 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 215c4019b50a3fdb599a0a981d27aef45ba17d80..53c00924f2e19ee37b25c4919893569deabb2d83 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 5d4a5889fe495ac2d966d0ce782f9982f361bdf8..710dd488921526e3e8854177976e2438de06e729 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 19a9626520d2bfd186b5c1af9cb9797effebf8ae..2d578730fcc70f6cbfff49cb5ae841bcd879968d 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 d91b51936450da67b2fc6d7f2b547b060e990bf8..f6d7bc6b8c963ebddb15d29935bbfe6ba8bd7bf1 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 cf9900e5aa335554c9f51da399b1d7319ff69281..a4276e28090d8a2a3afe5aed00d24d91d5de0516 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 f55b2645c6a2cca7d632ceb065bfcac61b75056a..dd164ef17b6a12d08c9b334a68e369eb95815ad0 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 3a533136209b33873e75e85d7ae7344c08871f90..dd177ae02068038922858ed3208cce05e4da58b7 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 dd651545cc2bfbe1a1fc2cfd74a2f2d667ddda69..0ba355f32d54583faefb1305a1a548abc60e8706 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 2fc5f85fbca0bca703ffe238e79aaaccc161883c..26df47aa615bcf0babcbd4ab52e8580edec710ff 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 e951652160c1beda1d206b7e3526a7ebeeaa020d..653eb0d2cfeba70e7edcf12915a56f2285ccd675 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 d5ac95c117a504a187912134de69158ada15c6d7..09d2b7d420af6cb04ac192c69794ada71aba6b11 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 6af81d3f80b3440bebba4d1dfee588ff15b50a2e..935cf17f47f9e5d71faf3ace6bbdbdf9e6817a94 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 573eab3f0d8a0bf78ec0ac0f1395de03268856ca..458142b670324ef1fcc0c5d6f507d649d2b18f2f 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 8e9f228759b4b83e72a881f384a103ceb1208239..84e95083359f6b930498e933bba170783c29b194 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 5de0a8e2f0cafbf7653f11f0bacb7f26a9593e72..efd801d20cacece09fba70736dc9be71ef26c180 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 125023fea0cb54e36832bee3de801657eab8884d..da3e0e4669d4c38de8dd0d5b6206262053805eb6 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 114a82ddb33ac2ecf206ea02a511f4ce0a50baf0..0de5a0807839feab0a2f3e7414c873c6a704dfb3 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 b65f9fac8c502fda36be004a6452028d693eab71..b80ef3d6c7cf63b4cafeca0dd6c36d5206d62d48 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 8cf5888ebdb5cd3e2b6194c91a1f6221cd238733..94b4321b90ca73fad0bb507558f60be62ddce022 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 7f6b0c593ad75f41f2778508da1fb7bea03cc56b..b145669f131cc41f65c6cd3de7a381538ba7c30c 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 b9d87c15f0343f5b59ce734a1e69932df45f85a8..25dbb005cd0e96118b0adec250eb10ad2e6155cd 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 8067c2d930756300b1e07466250a61ea8435b9f7..d3423fcd40743c60c323692b17313b30e302c1ef 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 b883a32c092406143d98e7ea1ba36dd37cee319d..f1f0a7cd12c1038fffdf05159144f55920ca31c5 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 e842fd87e212ab6d3a7c47cfc2af96c9e6764f64..10ddf6278e310b400981bdc0837632830cf820b6 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 28f0876c8f45ffd03ec4720a696b8be2f93debc0..f17f7c165498c0065af07b9fb01d7b8e22943fed 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 ad32184625b45024393470711c3b6d9ec2228a6c..1e392772ec4656763249bc2f96ec8c5cbc2d49e1 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 4d34d0e2c9612818ec5f635addbf38fe050e0b8c..8f28a5df34af4e6bbd8364722a5c26c86a949c38 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 b252f90818f5a95fea68b60bc909a4f3a0d047a2..169528be593de35517b7b099efdfaf03058813cc 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 5f2ced9cc5f49dc793c3f881c8592f91baaa38c6..3119e93383f0393cf7b7b3c91f5809b0ec0c1740 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 6b4d3beae6c4b6f3aad4bc8a2c9500fa53b9b9c2..a996dd83594e49d82bd4a3bdff5a4451a2c08605 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 cf2ccaa7bc1680387d2b4001a615f513ad890256..83b28e0e5d6b003cc1220e64f837bdb000086618 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 f3f7d3395b6d3dc630e643e0d2a4ff6148f492d0..9e8087a7dd03650b8360078dd10e145bafffb498 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 dfe4b0fa118b1a5847ee15c5f8e711e813939538..1cd323a412028820c506faf69dc2ec1d1057aad1 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 5aad2267da9dc3d48dc5a3cb9f544b1f8e0b168a..eb883b6302df6d30b30d4df3449dfcfe3622496b 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 246d069cf25a52176cae2d6a3e759b4d493bb5aa..1a23159ed799afbc9ee3c99da1027a02a64a0b4e 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 0718e176febb5d0e2721903e32a65b82d2ad52c1..ddb16fb948814cc236530ba393bd09532e553e73 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 4d551f7fa6967b671f40fa89b252cdeaf7dab176..58006c0073faa282189d0f2476135e4083c4bc08 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 c311fb3451ac38ecefa925801226a4d0d2216ce5..87ecd7ba9a31f98059e3512f2413ffa1060ac62b 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 25923f0946b5e18dfbf59961ff9bdb1183ddf9ff..4993a8210efa76d543640f5bd6714fab59da7af9 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 a13d98cf44d1915f4980f0938259d39479c78ec1..5c6310c5f56631f77fafeb531d6753a316b24b7c 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 b4cd58cb7c05d3ac6912330ffd0c3d987bfae180..6fb75747e7b188ee6049e28c5756aa8127fd96dc 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 7fd78bb97984a2a774636a2c1f13697f7491b10b..e3d8e0840d7834e669d3245acc73a22697503691 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 0a2f43c6252bce51f6eb774a4c1578118c32d783..d73682d14932d689e1622fdadaccc250fbbcd2b1 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 3fcfc3d1caf5bfee792127609d80dce965216128..8b69540d1d811b8e38796ef8f8619c28ac9fb96c 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 12b66195de7103a938f490d1976c70b30fa3ab5e..3048d81231fc0eaac6e756ee3e90c5f150080d3f 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 6d0a2391f35f3e0a762f56d6c36a93f1495be381..30c3c3354bc7af25ca299cfbe37eb8666cc0d6ef 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 a263b39f02db258ad97a86082e0bf4150b59dba4..e363f8563b6ab21b22cf3c978fe8a7f34a3b69a3 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 edc0e4da0bce5999a4a45419b17c80a9573e8f43..9de13b1b29bf477f00dc4cffac7977dce43f01c8 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 eee5f3e9ce2ed5bfb3ebd65ae6e457d98e366d7e..44e9a3f1a900239daf6018e1a30f53c41c335a5c 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 8f8f1809e60dade5261d989d86256488b441aae7..a22d144000e5e3aea25d6db636773ab708f1becc 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 cee06e3418109b29f70534189f931c8e84405635..f58fe42018f14a7dcab90fb6becbc8a12ef1a775 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 78d67b291775a4a2be0e353227e1c73566336fca..f1b3ad9fbd50031e5930b67b8f709a2f56a89dd8 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 ed58e624be19a4b59e011b4afad116a5ff8a7dd8..604c0d017ac69eec7e9d6367b2de4bf8e7742d01 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 ade79f20e359fb2d39ce63d7f4676c126476422d..6a4499ac0b6d968736214f6940b54a612529d29d 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 f8769e96288ce3e8b7a5d653d521cc6d4a317948..a14fc6000d7eef9c31e1a33a1fd87124d12e63d3 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 5900f82a188303ab9a2e162c2328f5e07761fa29..3e07dd8c0104ece2e16aa42ee7a703eb92fc676a 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 2e93666403a07468e15ba6399720b3d24a93d6a8..de80fbb5f69e7171e39f0f10bfbc1f9820e03e40 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 d647b49beed02c5044824b414c026f707bea8ec7..2b977b87def83b791c193ca1125029518dc80577 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 0b0d33c76d51c32b82a62fde190a941bda295af1..a19125a845bba3dc42c2874a129e91f417052653 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 636f4e3d3b4c0305fc3a3c151c55e05fab2706b7..6c654b7d8cdfb5cb2290510f1b593f5ac3bc8c8e 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 4824424ad80fe7f1f9fdedaf6b533bdd2ee79192..49439c2b083f423fea41b51dbfaf4f7ed78c5aef 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 7830e9c146f67d3ee97a8213a3d512f16660bd8e..7f05e9247a84c7c63fa6cded1ce0c9e10925540f 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 9de986cd0568c4f4ff3508c463703cccc6bb1d3c..29ee77c001ecf71679a34629a5abf370f88c4f36 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 9665917af61fcb6f3234f7504462d8200a3bce60..05d6edb71e7c793bddc87abee45f73572354ef71 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 b519eda92517768f9e360677341cbb8b5b486e22..c2794f950acf84fe521f7dd18a1820f6bb382d8f 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 05b1da34d3230d86fab5c2e5d87e91234c0a09fb..eb3d906df817e707558bc9df915c156469b15304 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 e518f45ed4e161471fa766bd465940d984b99972..9d060c4742d33af0155db4f71050eb40f3c1092c 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 bfd4aa727893e798758d0cb18edbc04ab78c3693..afbe3f3914c438c00da5e365ed9c0200ec62403b 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 f7fefe1b7aa56c9b4b64892326b33b0c8bb7e9e3..3e324d9c2c9c0aa9c13540d913788b05cea97be9 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 403e8f1335c2191fc2f25318b2ac8c4078e941cb..2f4f279608c04af8f1c5d0099bb6926fd1a77fea 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 d106c6d906227c1418d48b887dd95ee3d8271874..00adad4a439ab5986bc4820285120aa3bec6daa5 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 c0c7c0accaabae59169e0cb60e3cee7477cba3b0..f4db315d09e097eaf4d7d334f602a08fda7c423e 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 2701362339a77609b4de2d812ddd327ae8bc69d9..8231371becb381696514a498146b008ada702fcd 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 1aeca4ee2c07ebf0f65a3bbf47f1fa6ba898f20e..95b351c4e50236b8f0e16fccc60c4eb0182bc7a3 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 ecc9f3cffa516804227ef665836e5615321d0d16..4e6acfaee2b89e8a64fbe37e41a78efe2060b4bd 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 0e1c2a8829269a9bb146535b3c3863d2833e8ce9..fdb60b1d767cdd140d45dd06c0aac28a09d7dce5 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 b4c7f598a4e34c8486280842a99a1deb5295c362..69925487193a732e4ed00a9e664f86851432016c 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 02ac0e2f64bb9549e7c7cad8c501d6ab6062fcdf..32b9b81b3fcf679daa34da86f97ecfb5b79f4caf 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 908a0b24158a4b13227b506dfcf2efbad0ff4910..b17a3c3c8bbc54c4aed4b8a10faf8d85d02c0ad1 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 813861e3c903597fc45f68324e9fde410e53233a..7c0830c2e5fe2c7ee83318a46761c6f35906b758 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 6e55b5b5e5f36a6160f6c0d0039ff779b7a2536e..368383f037e1d069125cf720708244f2f331d0d3 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 14bc958367def52672dd72e9d0a22c9ccc3e9c30..be98a6c72b5ffe536b8f82b49e0d91864a73e823 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 6940130b21f97c95d6c4d86c949cfa24ca812600..cdbd103b4bb70d46333900a247753cd2ed793adf 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 af697007e58d0298fab54ac98346c9fa3b3d2449..c66e160d6bb0e49a7545adce31c142b82f5ee265 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 03173f68ebef5b3a820f3900cb1cf3fa70bb136c..31d25d1983b91339d509971643c2ede688ae6c65 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 a0ae578436648f5b0bcdad5dff159b817ea2f25e..9bf020ff6c3565aac82212bd607eef2a6b3bd014 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 063ff6271d9fdeacf5ab7e00cef50fa254f1c8b3..004193aa997e044f5445b638d70019060a18d392 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 763d8c05189f729da5f5fdbb1ca0289b8b9c9b9b..f955c594baddea3fff1babb292f7cbdada251c04 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 7b051c3268291618b8314fee01a68ede92d42c72..c686b60e1d9eb168e8bf265b8c6a2373a5b0cdda 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 6d766a477d20655fe9b4558f0a713f354eae01c5..b19670d311bf34139162ad8895580782b14c94b5 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 fe3e2a85fbb2a1436e23352c2bc06f159f4c345a..f5946eafc8c06a0a1af1b1255dbe82dcf36cd802 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 4b1a0b3c6daddfcd4894b0a2bd64bc76df581024..a7a47796007139d7e09e726da982052914600282 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 3102149ff4b5e22a0d0673c06b6b3ae0054dc973..b0a9d2096ae2574953c346e1a4d9f44383951238 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 9152dbec17fcbc50965a5b2829e57e6aec1ac9c8..c7962c3415228db3d0dbaa15b50cc27ffd3cf12d 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 08732f25eedd46b947445a642eb438c3b4167c12..894c2fb3b5e225e4354c1e38ee9a73b5e95408d0 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 db1abc6728f4e71fe55823fde35fd5196e9cbdd5..babf5a4434b5a7f6024b80125f849d6969a9ad59 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 29a3ad17d8fa67533ee192bbe3a48b99c579e90c..f260b843cfb6213873464b73bd8a82e197c9f361 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 5d8a5e7ccf9bea821d4ec6c0f0485819ffd71b65..a6544c1e8b27567df94d361235ccacc52f6b2e99 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 7f4fea4b5c6b772cbb6c6049892f68a5575f5b6b..8d1d9c6c1c9c127076a1e058003b30bd50aae7e4 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"