From b2defd2a1de647cdf1e7b93aebca25520b7aed53 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Fri, 6 Jan 2023 13:36:27 -0800
Subject: [PATCH] Move database name saving out of v1Upgrade
---
indexedDb/channels/init.go | 14 +++++++-------
indexedDb/dm/init.go | 18 +++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/indexedDb/channels/init.go b/indexedDb/channels/init.go
index da730d7a..b7f1ec54 100644
--- a/indexedDb/channels/init.go
+++ b/indexedDb/channels/init.go
@@ -89,6 +89,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return nil, err
}
+ // Get the database name and save it to storage
+ if dbName, err2 := db.Name(); err2 != nil {
+ return nil, err2
+ } else if err = storeDatabaseName(dbName); err != nil {
+ return nil, err
+ }
+
// Save the encryption status to storage
encryptionStatus := encryption != nil
loadedEncryptionStatus, err :=
@@ -165,13 +172,6 @@ func v1Upgrade(db *idb.Database) error {
return err
}
- // Get the database name and save it to storage
- if databaseName, err2 := db.Name(); err2 != nil {
- return err2
- } else if err = storeDatabaseName(databaseName); err != nil {
- return err
- }
-
return nil
}
diff --git a/indexedDb/dm/init.go b/indexedDb/dm/init.go
index c709b19b..e3e371cf 100644
--- a/indexedDb/dm/init.go
+++ b/indexedDb/dm/init.go
@@ -63,8 +63,7 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
openRequest, err := idb.Global().Open(ctx, databaseName, currentVersion,
func(db *idb.Database, oldVersion, newVersion uint) error {
if oldVersion == newVersion {
- jww.INFO.Printf("IndexDb version is current: v%d",
- newVersion)
+ jww.INFO.Printf("IndexDb version is current: v%d", newVersion)
return nil
}
@@ -92,6 +91,13 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
return nil, err
}
+ // Get the database name and save it to storage
+ if dbName, err2 := db.Name(); err2 != nil {
+ return nil, err2
+ } else if err = storeDatabaseName(dbName); err != nil {
+ return nil, err
+ }
+
// Save the encryption status to storage
encryptionStatus := encryption != nil
loadedEncryptionStatus, err :=
@@ -167,13 +173,6 @@ func v1Upgrade(db *idb.Database) error {
return err
}
- // Get the database name and save it to storage
- if databaseName, err2 := db.Name(); err2 != nil {
- return err2
- } else if err = storeDatabaseName(databaseName); err != nil {
- return err
- }
-
return nil
}
@@ -213,6 +212,7 @@ func RegisterDatabaseNameStore(m *manager) {
"response about storing the database name in local "+
"storage in the main thread", indexedDbWorker.ResponseTimeout)
}
+
return nil
}
}
--
GitLab