Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
X
xxdk-wasm
Manage
Activity
Members
Labels
Automate
Agent sessions
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elixxir
xxdk-wasm
Commits
9179db39
Commit
9179db39
authored
Dec 15, 2022
by
Jono Wenger
Browse files
Options
Downloads
Patches
Plain Diff
Fix error reporting in UpdateSentStatus and make Get check if the result is undefined
parent
30832993
No related branches found
Tags
Tags containing commit
1 merge request
!44
Fix error reporting in UpdateSentStatus and make Get check if the result is undefined
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
indexedDb/channels/implementation.go
+5
-0
5 additions, 0 deletions
indexedDb/channels/implementation.go
indexedDb/utils.go
+3
-0
3 additions, 0 deletions
indexedDb/utils.go
indexedDb/utils_test.go
+59
-0
59 additions, 0 deletions
indexedDb/utils_test.go
with
67 additions
and
0 deletions
indexedDb/channels/implementation.go
+
5
−
0
View file @
9179db39
...
@@ -288,6 +288,8 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64,
...
@@ -288,6 +288,8 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64,
// Use the key to get the existing Message
// Use the key to get the existing Message
currentMsg
,
err
:=
indexedDb
.
Get
(
w
.
db
,
messageStoreName
,
key
)
currentMsg
,
err
:=
indexedDb
.
Get
(
w
.
db
,
messageStoreName
,
key
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Unable to get message: %+v"
,
err
))
return
return
}
}
...
@@ -295,8 +297,11 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64,
...
@@ -295,8 +297,11 @@ func (w *wasmModel) UpdateSentStatus(uuid uint64,
newMessage
:=
&
Message
{}
newMessage
:=
&
Message
{}
err
=
json
.
Unmarshal
([]
byte
(
utils
.
JsToJson
(
currentMsg
)),
newMessage
)
err
=
json
.
Unmarshal
([]
byte
(
utils
.
JsToJson
(
currentMsg
)),
newMessage
)
if
err
!=
nil
{
if
err
!=
nil
{
jww
.
ERROR
.
Printf
(
"%+v"
,
errors
.
WithMessagef
(
parentErr
,
"Could not JSON unmarshal message: %+v"
,
err
))
return
return
}
}
newMessage
.
Status
=
uint8
(
status
)
newMessage
.
Status
=
uint8
(
status
)
if
!
messageID
.
Equals
(
cryptoChannel
.
MessageID
{})
{
if
!
messageID
.
Equals
(
cryptoChannel
.
MessageID
{})
{
newMessage
.
MessageID
=
messageID
.
Bytes
()
newMessage
.
MessageID
=
messageID
.
Bytes
()
...
...
This diff is collapsed.
Click to expand it.
indexedDb/utils.go
+
3
−
0
View file @
9179db39
...
@@ -61,6 +61,9 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro
...
@@ -61,6 +61,9 @@ func Get(db *idb.Database, objectStoreName string, key js.Value) (js.Value, erro
if
err
!=
nil
{
if
err
!=
nil
{
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
return
js
.
Undefined
(),
errors
.
WithMessagef
(
parentErr
,
"Unable to get from ObjectStore: %+v"
,
err
)
"Unable to get from ObjectStore: %+v"
,
err
)
}
else
if
resultObj
.
IsUndefined
()
{
return
js
.
Undefined
(),
errors
.
WithMessage
(
parentErr
,
"Unable to get from ObjectStore: result is undefined"
)
}
}
// Process result into string
// Process result into string
...
...
This diff is collapsed.
Click to expand it.
indexedDb/utils_test.go
0 → 100644
+
59
−
0
View file @
9179db39
////////////////////////////////////////////////////////////////////////////////
// Copyright © 2022 xx foundation //
// //
// Use of this source code is governed by a license that can be found in the //
// LICENSE file. //
////////////////////////////////////////////////////////////////////////////////
package
indexedDb
import
(
"github.com/hack-pad/go-indexeddb/idb"
"strings"
"syscall/js"
"testing"
)
// Error path: Tests that Get returns an error when trying to get a message that
// does not exist.
func
TestGet_NoMessageError
(
t
*
testing
.
T
)
{
db
:=
newTestDB
(
"messages"
,
t
)
_
,
err
:=
Get
(
db
,
"messages"
,
js
.
ValueOf
(
5
))
if
err
==
nil
||
!
strings
.
Contains
(
err
.
Error
(),
"undefined"
)
{
t
.
Errorf
(
"Did not get expected error when getting a message that "
+
"does not exist: %+v"
,
err
)
}
}
// newTestDB creates a new idb.Database for testing.
func
newTestDB
(
messageStoreName
string
,
t
*
testing
.
T
)
*
idb
.
Database
{
// Attempt to open database object
ctx
,
cancel
:=
NewContext
()
defer
cancel
()
openRequest
,
err
:=
idb
.
Global
()
.
Open
(
ctx
,
"databaseName"
,
0
,
func
(
db
*
idb
.
Database
,
_
uint
,
_
uint
)
error
{
storeOpts
:=
idb
.
ObjectStoreOptions
{
KeyPath
:
js
.
ValueOf
(
"id"
),
AutoIncrement
:
true
,
}
// Build Message ObjectStore and Indexes
_
,
err
:=
db
.
CreateObjectStore
(
messageStoreName
,
storeOpts
)
if
err
!=
nil
{
return
err
}
return
nil
})
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
// Wait for database open to finish
db
,
err
:=
openRequest
.
Await
(
ctx
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
return
db
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment