From 2e26a07d9490ae5a2ff0e5e51a7575ba08cf90cc Mon Sep 17 00:00:00 2001 From: "Richard T. Carback III" <rick.carback@gmail.com> Date: Thu, 10 Nov 2022 18:57:03 +0000 Subject: [PATCH] Update to version 0.1.5, including updating code to use client v5.0.0 --- go.mod | 1 + go.sum | 2 ++ indexedDb/implementation.go | 4 ++-- indexedDb/implementation_test.go | 4 ++-- indexedDb/init.go | 2 +- main.go | 2 +- storage/purge.go | 2 +- storage/version.go | 4 ++-- wasm/authenticatedConnection.go | 2 +- wasm/authenticatedConnection_test.go | 2 +- wasm/backup.go | 2 +- wasm/backup_test.go | 2 +- wasm/channels.go | 2 +- wasm/channels_test.go | 2 +- wasm/cmix.go | 2 +- wasm/cmix_test.go | 2 +- wasm/connect.go | 2 +- wasm/connect_test.go | 2 +- wasm/delivery.go | 2 +- wasm/docs.go | 22 +++++++++++----------- wasm/dummy.go | 2 +- wasm/e2e.go | 2 +- wasm/e2e_test.go | 2 +- wasm/errors.go | 2 +- wasm/fileTransfer.go | 4 ++-- wasm/fileTransfer_test.go | 2 +- wasm/group.go | 2 +- wasm/group_test.go | 2 +- wasm/identity.go | 4 ++-- wasm/logging.go | 2 +- wasm/ndf.go | 2 +- wasm/params.go | 4 ++-- wasm/restlike.go | 2 +- wasm/restlikeSingle.go | 2 +- wasm/secrets.go | 2 +- wasm/single.go | 2 +- wasm/single_test.go | 2 +- wasm/timeNow.go | 2 +- wasm/ud.go | 2 +- wasm/ud_test.go | 2 +- wasm/version.go | 2 +- wasm_test.go | 2 +- 42 files changed, 59 insertions(+), 56 deletions(-) diff --git a/go.mod b/go.mod index 3ec87cca..17904fa6 100644 --- a/go.mod +++ b/go.mod @@ -56,6 +56,7 @@ require ( github.com/tyler-smith/go-bip39 v1.1.0 // indirect github.com/zeebo/blake3 v0.2.3 // indirect gitlab.com/elixxir/bloomfilter v0.0.0-20211222005329-7d931ceead6f // indirect + gitlab.com/elixxir/client/v5 v5.0.0 // indirect gitlab.com/elixxir/comms v0.0.4-0.20221110181420-84bca6216fe4 // indirect gitlab.com/elixxir/ekv v0.2.1 // indirect gitlab.com/xx_network/comms v0.0.4-0.20221110181111-4f0694876936 // indirect diff --git a/go.sum b/go.sum index f3f40482..48103d48 100644 --- a/go.sum +++ b/go.sum @@ -653,6 +653,8 @@ gitlab.com/elixxir/client v1.5.1-0.20221110000957-8dcb19b3fddc h1:gCfVpRIcWmximb gitlab.com/elixxir/client v1.5.1-0.20221110000957-8dcb19b3fddc/go.mod h1:cwrsLJe22odcAwjmkid8CrisvIPdAha5CU1Khm+wmAI= gitlab.com/elixxir/client v1.5.1-0.20221110181926-77324fd5245b h1:TiHPRyO41IfxXM3mnd3UuP9tcvQQZPUd4mmaR0l7Duw= gitlab.com/elixxir/client v1.5.1-0.20221110181926-77324fd5245b/go.mod h1:f3LmATLJ9PoRqTlqx2B3D/Zhb59Cp+JtpvgT3nhoij8= +gitlab.com/elixxir/client/v5 v5.0.0 h1:YuFDkKxz9y7xPikO5I0S4mITq40Y9stdIcTeHdw0ZHk= +gitlab.com/elixxir/client/v5 v5.0.0/go.mod h1:PcdYVLbgrkv3HDCCkvGO3j5Lywr8WGL/vBgh75P8c4c= gitlab.com/elixxir/comms v0.0.4-0.20221108183306-7c473bca3cd6 h1:9oxGMvOC8UPG5ocBlEjZjKBA2X2P9dpwyd48ywL+Uyk= gitlab.com/elixxir/comms v0.0.4-0.20221108183306-7c473bca3cd6/go.mod h1:fWr0w/UMT/A7aw+Fw7y9kOOTqE3aYxwo5cl6obrysHM= gitlab.com/elixxir/comms v0.0.4-0.20221110181420-84bca6216fe4 h1:bLRjVCyMVde4n2hTVgoyyIAWrKI4CevpChchkPeb6A0= diff --git a/indexedDb/implementation.go b/indexedDb/implementation.go index 59192d26..c5c70da7 100644 --- a/indexedDb/implementation.go +++ b/indexedDb/implementation.go @@ -22,8 +22,8 @@ import ( "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/channels" - "gitlab.com/elixxir/client/cmix/rounds" + "gitlab.com/elixxir/client/v5/channels" + "gitlab.com/elixxir/client/v5/cmix/rounds" cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast" cryptoChannel "gitlab.com/elixxir/crypto/channel" "gitlab.com/elixxir/xxdk-wasm/utils" diff --git a/indexedDb/implementation_test.go b/indexedDb/implementation_test.go index d4f6226f..56938b96 100644 --- a/indexedDb/implementation_test.go +++ b/indexedDb/implementation_test.go @@ -21,8 +21,8 @@ import ( "time" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/channels" - "gitlab.com/elixxir/client/cmix/rounds" + "gitlab.com/elixxir/client/v5/channels" + "gitlab.com/elixxir/client/v5/cmix/rounds" cryptoBroadcast "gitlab.com/elixxir/crypto/broadcast" "gitlab.com/elixxir/crypto/channel" "gitlab.com/xx_network/primitives/id" diff --git a/indexedDb/init.go b/indexedDb/init.go index f24d0373..c424be45 100644 --- a/indexedDb/init.go +++ b/indexedDb/init.go @@ -13,7 +13,7 @@ import ( "github.com/hack-pad/go-indexeddb/idb" "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/channels" + "gitlab.com/elixxir/client/v5/channels" cryptoChannel "gitlab.com/elixxir/crypto/channel" "gitlab.com/elixxir/xxdk-wasm/storage" "gitlab.com/xx_network/primitives/id" diff --git a/main.go b/main.go index 7c5f570c..01df0b97 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,7 @@ package main import ( "fmt" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/storage" "gitlab.com/elixxir/xxdk-wasm/utils" "gitlab.com/elixxir/xxdk-wasm/wasm" diff --git a/storage/purge.go b/storage/purge.go index abf3fe8f..23a7c87a 100644 --- a/storage/purge.go +++ b/storage/purge.go @@ -12,7 +12,7 @@ package storage import ( "github.com/hack-pad/go-indexeddb/idb" "github.com/pkg/errors" - "gitlab.com/elixxir/client/storage/utility" + "gitlab.com/elixxir/client/v5/storage/utility" "gitlab.com/elixxir/xxdk-wasm/utils" "sync/atomic" "syscall/js" diff --git a/storage/version.go b/storage/version.go index 577fd52a..ea441e71 100644 --- a/storage/version.go +++ b/storage/version.go @@ -14,11 +14,11 @@ import ( "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" ) // SEMVER is the current semantic version of xxDK WASM. -const SEMVER = "0.1.4" +const SEMVER = "0.1.5" // Storage keys. const ( diff --git a/wasm/authenticatedConnection.go b/wasm/authenticatedConnection.go index c18f48d0..5125dfdc 100644 --- a/wasm/authenticatedConnection.go +++ b/wasm/authenticatedConnection.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/authenticatedConnection_test.go b/wasm/authenticatedConnection_test.go index a50eaf12..23a606ad 100644 --- a/wasm/authenticatedConnection_test.go +++ b/wasm/authenticatedConnection_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/backup.go b/wasm/backup.go index cd5f2f57..68098e34 100644 --- a/wasm/backup.go +++ b/wasm/backup.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/backup_test.go b/wasm/backup_test.go index 8ac779ae..5c8447df 100644 --- a/wasm/backup_test.go +++ b/wasm/backup_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/channels.go b/wasm/channels.go index e7a4694d..e1cc78f7 100644 --- a/wasm/channels.go +++ b/wasm/channels.go @@ -15,7 +15,7 @@ import ( "sync" "syscall/js" - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/indexedDb" "gitlab.com/elixxir/xxdk-wasm/utils" ) diff --git a/wasm/channels_test.go b/wasm/channels_test.go index 127657af..edb9b8a8 100644 --- a/wasm/channels_test.go +++ b/wasm/channels_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/crypto/channel" "gitlab.com/elixxir/xxdk-wasm/utils" "gitlab.com/xx_network/crypto/csprng" diff --git a/wasm/cmix.go b/wasm/cmix.go index 0d6b2799..f33b3876 100644 --- a/wasm/cmix.go +++ b/wasm/cmix.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/cmix_test.go b/wasm/cmix_test.go index 2455ff06..d5cdb5af 100644 --- a/wasm/cmix_test.go +++ b/wasm/cmix_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/connect.go b/wasm/connect.go index cd3cce95..c06f83cc 100644 --- a/wasm/connect.go +++ b/wasm/connect.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/connect_test.go b/wasm/connect_test.go index 5c973991..38902434 100644 --- a/wasm/connect_test.go +++ b/wasm/connect_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/delivery.go b/wasm/delivery.go index 937ab3db..ffa772c6 100644 --- a/wasm/delivery.go +++ b/wasm/delivery.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/docs.go b/wasm/docs.go index e644cc07..01aeed80 100644 --- a/wasm/docs.go +++ b/wasm/docs.go @@ -11,17 +11,17 @@ package wasm import ( "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/auth" - "gitlab.com/elixxir/client/catalog" - "gitlab.com/elixxir/client/channels" - "gitlab.com/elixxir/client/cmix" - "gitlab.com/elixxir/client/cmix/message" - "gitlab.com/elixxir/client/connect" - "gitlab.com/elixxir/client/e2e/ratchet/partner" - ftE2e "gitlab.com/elixxir/client/fileTransfer/e2e" - "gitlab.com/elixxir/client/groupChat/groupStore" - "gitlab.com/elixxir/client/restlike" - "gitlab.com/elixxir/client/single" + "gitlab.com/elixxir/client/v5/auth" + "gitlab.com/elixxir/client/v5/catalog" + "gitlab.com/elixxir/client/v5/channels" + "gitlab.com/elixxir/client/v5/cmix" + "gitlab.com/elixxir/client/v5/cmix/message" + "gitlab.com/elixxir/client/v5/connect" + "gitlab.com/elixxir/client/v5/e2e/ratchet/partner" + ftE2e "gitlab.com/elixxir/client/v5/fileTransfer/e2e" + "gitlab.com/elixxir/client/v5/groupChat/groupStore" + "gitlab.com/elixxir/client/v5/restlike" + "gitlab.com/elixxir/client/v5/single" "gitlab.com/elixxir/crypto/broadcast" "gitlab.com/elixxir/crypto/channel" "gitlab.com/elixxir/crypto/contact" diff --git a/wasm/dummy.go b/wasm/dummy.go index 93337713..5bccb616 100644 --- a/wasm/dummy.go +++ b/wasm/dummy.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/e2e.go b/wasm/e2e.go index 4da247f9..fbc448f8 100644 --- a/wasm/e2e.go +++ b/wasm/e2e.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/e2e_test.go b/wasm/e2e_test.go index d4b55d21..54f45300 100644 --- a/wasm/e2e_test.go +++ b/wasm/e2e_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/errors.go b/wasm/errors.go index 1c45a71e..8a8a715f 100644 --- a/wasm/errors.go +++ b/wasm/errors.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/fileTransfer.go b/wasm/fileTransfer.go index 21e43530..04c3bd8f 100644 --- a/wasm/fileTransfer.go +++ b/wasm/fileTransfer.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) @@ -118,7 +118,7 @@ func (rpc *fileTransferReceiveProgressCallback) Callback( // - args[0] - ID of [E2e] object in tracker (int). // - args[1] - Javascript object that has functions that implement the // [bindings.ReceiveFileCallback] interface. -// - args[2] - JSON of [gitlab.com/elixxir/client/fileTransfer/e2e.Params] +// - args[2] - JSON of [gitlab.com/elixxir/client/v5/fileTransfer/e2e.Params] // (Uint8Array). // - args[3] - JSON of [fileTransfer.Params] (Uint8Array). // diff --git a/wasm/fileTransfer_test.go b/wasm/fileTransfer_test.go index ead8b566..67cb4256 100644 --- a/wasm/fileTransfer_test.go +++ b/wasm/fileTransfer_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/group.go b/wasm/group.go index 84db2abe..0c4fa32d 100644 --- a/wasm/group.go +++ b/wasm/group.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/group_test.go b/wasm/group_test.go index 1350fc4a..bbb1fe34 100644 --- a/wasm/group_test.go +++ b/wasm/group_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/identity.go b/wasm/identity.go index 2f2576e4..4c619216 100644 --- a/wasm/identity.go +++ b/wasm/identity.go @@ -10,8 +10,8 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" - "gitlab.com/elixxir/client/xxdk" + "gitlab.com/elixxir/client/v5/bindings" + "gitlab.com/elixxir/client/v5/xxdk" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/logging.go b/wasm/logging.go index 950281c2..e2f24b80 100644 --- a/wasm/logging.go +++ b/wasm/logging.go @@ -14,7 +14,7 @@ import ( "github.com/armon/circbuf" "github.com/pkg/errors" jww "github.com/spf13/jwalterweatherman" - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "io" "log" diff --git a/wasm/ndf.go b/wasm/ndf.go index 8e84254b..1171b528 100644 --- a/wasm/ndf.go +++ b/wasm/ndf.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/params.go b/wasm/params.go index d3211cf5..ac490fe5 100644 --- a/wasm/params.go +++ b/wasm/params.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) @@ -60,7 +60,7 @@ func GetDefaultSingleUseParams(js.Value, []js.Value) interface{} { // modify the JSON to change single use settings. // // Returns: -// - JSON of [gitlab.com/elixxir/client/fileTransfer/e2e.Params] (Uint8Array). +// - JSON of [gitlab.com/elixxir/client/v5/fileTransfer/e2e.Params] (Uint8Array). func GetDefaultE2eFileTransferParams(js.Value, []js.Value) interface{} { return utils.CopyBytesToJS(bindings.GetDefaultE2eFileTransferParams()) } diff --git a/wasm/restlike.go b/wasm/restlike.go index 1062c537..24512911 100644 --- a/wasm/restlike.go +++ b/wasm/restlike.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/restlikeSingle.go b/wasm/restlikeSingle.go index 64365045..27aa5fb3 100644 --- a/wasm/restlikeSingle.go +++ b/wasm/restlikeSingle.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/secrets.go b/wasm/secrets.go index 8f427b71..441ead9f 100644 --- a/wasm/secrets.go +++ b/wasm/secrets.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/single.go b/wasm/single.go index 7ea91ec3..c1a6711a 100644 --- a/wasm/single.go +++ b/wasm/single.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/single_test.go b/wasm/single_test.go index d1276075..cd9a01be 100644 --- a/wasm/single_test.go +++ b/wasm/single_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/timeNow.go b/wasm/timeNow.go index 97c22ac3..966e78d9 100644 --- a/wasm/timeNow.go +++ b/wasm/timeNow.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/ud.go b/wasm/ud.go index 62202082..c3217121 100644 --- a/wasm/ud.go +++ b/wasm/ud.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/utils" "syscall/js" ) diff --git a/wasm/ud_test.go b/wasm/ud_test.go index 40ae06bc..21e113ba 100644 --- a/wasm/ud_test.go +++ b/wasm/ud_test.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "reflect" "testing" ) diff --git a/wasm/version.go b/wasm/version.go index 27388fad..0e3a6eda 100644 --- a/wasm/version.go +++ b/wasm/version.go @@ -10,7 +10,7 @@ package wasm import ( - "gitlab.com/elixxir/client/bindings" + "gitlab.com/elixxir/client/v5/bindings" "gitlab.com/elixxir/xxdk-wasm/storage" "syscall/js" ) diff --git a/wasm_test.go b/wasm_test.go index 38d1bdd3..70607cbe 100644 --- a/wasm_test.go +++ b/wasm_test.go @@ -51,7 +51,7 @@ func TestPublicFunctions(t *testing.T) { } wasmFuncs := getPublicFunctions("wasm", t) bindingsFuncs := getPublicFunctions( - "vendor/gitlab.com/elixxir/client/bindings", t) + "vendor/gitlab.com/elixxir/client/v5/bindings", t) for fnName := range bindingsFuncs { if _, exists := wasmFuncs[fnName]; !exists { -- GitLab