Skip to content
Snippets Groups Projects
Commit 54f8947e authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge remote-tracking branch 'origin/release' into project/adminCommands

parents c81cd16a 86e3f7d2
No related branches found
No related tags found
2 merge requests!60Revert "Fail a test to be sure it works",!32Admin Commands
......@@ -498,6 +498,9 @@ func (w *wasmModel) receiveHelper(newMessage *Message, isUpdate bool) (uint64,
return 0, errors.Errorf("Upserting Message failed: %+v", err)
}
res, err := addReq.Result()
if err != nil {
return 0, errors.Errorf("Getting result from request failed: %+v", err)
}
// NOTE: Sometimes the insert fails to return an error but hits a duplicate
// insert, so this fallthrough returns the UUID entry in that case.
......
......@@ -109,9 +109,6 @@ func newWASMModel(databaseName string, encryption cryptoChannel.Cipher,
}
// Attempt to ensure the database has been properly initialized
if err != nil {
return nil, err
}
openRequest, err = idb.Global().Open(ctx, databaseName, currentVersion,
func(db *idb.Database, oldVersion, newVersion uint) error {
return nil
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment