From 296b3e62b4bf2ab106468f9dcb472a695d291191 Mon Sep 17 00:00:00 2001
From: benjamin <ben@elixxir.io>
Date: Wed, 26 Oct 2022 20:11:58 -0700
Subject: [PATCH] god kill me
---
go.mod | 2 +-
go.sum | 2 ++
indexedDb/init.go | 50 ++++++++++++++++-------------------------------
3 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/go.mod b/go.mod
index 6190b98b..df7a9519 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
github.com/hack-pad/go-indexeddb v0.2.0
github.com/pkg/errors v0.9.1
github.com/spf13/jwalterweatherman v1.1.0
- gitlab.com/elixxir/client v1.5.1-0.20221027022619-db750a090c5f
+ gitlab.com/elixxir/client v1.5.1-0.20221027031009-387b9b9d7ce2
gitlab.com/elixxir/crypto v0.0.7-0.20221026155635-b8e44a9e8bba
gitlab.com/elixxir/primitives v0.0.3-0.20221025020430-f5d2eb330fbc
gitlab.com/xx_network/crypto v0.0.5-0.20221025020316-517fa8f91d2c
diff --git a/go.sum b/go.sum
index 3bd6cdd9..e4449463 100644
--- a/go.sum
+++ b/go.sum
@@ -634,6 +634,8 @@ gitlab.com/elixxir/client v1.5.1-0.20221027004556-4dd4ba27bd95 h1:qmgBNu3QSCbVF/
gitlab.com/elixxir/client v1.5.1-0.20221027004556-4dd4ba27bd95/go.mod h1:ilSiqYjBvMajkb5iSyq+f4uOX29fOcH8Ry/StjR2CM0=
gitlab.com/elixxir/client v1.5.1-0.20221027022619-db750a090c5f h1:VeQWg6JKPJwCt8RSzGa3ryj9sRMLx0wSb3z6wiXuJQ0=
gitlab.com/elixxir/client v1.5.1-0.20221027022619-db750a090c5f/go.mod h1:ilSiqYjBvMajkb5iSyq+f4uOX29fOcH8Ry/StjR2CM0=
+gitlab.com/elixxir/client v1.5.1-0.20221027031009-387b9b9d7ce2 h1:hcPZvmcdPnD32FS7kVSCFfhH0BEIKSG6VkBzWtViFAU=
+gitlab.com/elixxir/client v1.5.1-0.20221027031009-387b9b9d7ce2/go.mod h1:ilSiqYjBvMajkb5iSyq+f4uOX29fOcH8Ry/StjR2CM0=
gitlab.com/elixxir/comms v0.0.4-0.20221027003916-cd6907e99c34 h1:mhU6BlQJBLiT82oLAZXuoH2RuZtxaSInONr6p2VylVo=
gitlab.com/elixxir/comms v0.0.4-0.20221027003916-cd6907e99c34/go.mod h1:AKyDyAa8GqC28Y5TFSC11bkz9YBOI0Zs0EHnZ2Vgx7g=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
diff --git a/indexedDb/init.go b/indexedDb/init.go
index 6805f5d5..f24d0373 100644
--- a/indexedDb/init.go
+++ b/indexedDb/init.go
@@ -13,13 +13,11 @@ import (
"github.com/hack-pad/go-indexeddb/idb"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
+ "gitlab.com/elixxir/client/channels"
cryptoChannel "gitlab.com/elixxir/crypto/channel"
"gitlab.com/elixxir/xxdk-wasm/storage"
- "syscall/js"
- "time"
-
- "gitlab.com/elixxir/client/channels"
"gitlab.com/xx_network/primitives/id"
+ "syscall/js"
)
const (
@@ -111,36 +109,22 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
}
// Attempt to ensure the database has been properly initialized
-
- var wrapper *wasmModel
- for shittyError := errors.New("dummy"); shittyError != nil; {
- // FIXME: The below is a hack that for some reason prevents moving on with
- // uninitialized database despite the previous call to Await.
- // It would be idea to find a different solution.
- // Close and open again to ensure the state is finalized
- err = db.Close()
- if err != nil {
- return nil, err
- }
- openRequest, err = idb.Global().Open(ctx, databaseName, currentVersion,
- func(db *idb.Database, oldVersion, newVersion uint) error {
- return nil
- })
- if err != nil {
- return nil, err
- }
- // Wait for database open to finish
- db, err = openRequest.Await(ctx)
- if err != nil {
- return nil, err
- }
- wrapper = &wasmModel{db: db, receivedMessageCB: cb, cipher: encryption}
- shittyError = wrapper.hackTestDb()
- if shittyError != nil {
- jww.ERROR.Println(shittyError)
- }
- time.Sleep(1 * time.Second)
+ if err != nil {
+ return nil, err
+ }
+ openRequest, err = idb.Global().Open(ctx, databaseName, currentVersion,
+ func(db *idb.Database, oldVersion, newVersion uint) error {
+ return nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ // Wait for database open to finish
+ db, err = openRequest.Await(ctx)
+ if err != nil {
+ return nil, err
}
+ wrapper := &wasmModel{db: db, receivedMessageCB: cb, cipher: encryption}
return wrapper, nil
}
--
GitLab