Skip to content
Snippets Groups Projects
Commit 85e5f7e6 authored by benjamin's avatar benjamin
Browse files

Merge remote-tracking branch 'origin/hotfix/message_id_unique' into hotfix/message_id_unique

parents b6abce24 1b8528d5
No related branches found
No related tags found
2 merge requests!60Revert "Fail a test to be sure it works",!10Make the message id index unique
......@@ -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.20221005170155-2b243d520561
gitlab.com/elixxir/client v1.5.1-0.20221005170957-7bd7001c3f39
gitlab.com/elixxir/crypto v0.0.7-0.20221003185354-b091598d2322
gitlab.com/elixxir/primitives v0.0.3-0.20220901220638-1acc75fabdc6
gitlab.com/xx_network/primitives v0.0.4-0.20220809193445-9fc0a5209548
......
......@@ -650,6 +650,8 @@ gitlab.com/elixxir/client v1.5.1-0.20221003205254-6cfac3468914 h1:ZWf+WxkfoRh41h
gitlab.com/elixxir/client v1.5.1-0.20221003205254-6cfac3468914/go.mod h1:wuTIcLuMnvIGSo8i/Gg/SbYF57bE+CbKPpA1Xbk2AKk=
gitlab.com/elixxir/client v1.5.1-0.20221005170155-2b243d520561 h1:DSq9qQcUB18nD961Ws16A8cr0aJfYx8sMo7r66lD2ac=
gitlab.com/elixxir/client v1.5.1-0.20221005170155-2b243d520561/go.mod h1:wuTIcLuMnvIGSo8i/Gg/SbYF57bE+CbKPpA1Xbk2AKk=
gitlab.com/elixxir/client v1.5.1-0.20221005170957-7bd7001c3f39 h1:KDgJOCkKwKQBBDM6q9MF3OBNkr0Y7h/YEcgX8OH/Chg=
gitlab.com/elixxir/client v1.5.1-0.20221005170957-7bd7001c3f39/go.mod h1:wuTIcLuMnvIGSo8i/Gg/SbYF57bE+CbKPpA1Xbk2AKk=
gitlab.com/elixxir/comms v0.0.4-0.20220916185715-f1e9a5eda939 h1:+VRx2ULHKs040bBhDAOKNCZnbcXxUk3jD9JoKQzQpLk=
gitlab.com/elixxir/comms v0.0.4-0.20220916185715-f1e9a5eda939/go.mod h1:AO6XkMhaHJW8eXlgL5m3UUcJqsSP8F5Wm1GX+wyq/rw=
gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c=
......
......@@ -167,11 +167,10 @@ func (w *wasmModel) ReceiveMessage(channelID *id.ID,
if !messageID.Equals(cryptoChannel.MessageID{}) {
jww.DEBUG.Printf("non-empty messageID detected")
uuid, err := w.msgIDLookup(messageID)
if err == nil {
jww.DEBUG.Printf("MessageID found: %d", uuid)
// message is already in the database, no
// insert necessary
return uuid
if err == nil && uuid != 0 {
jww.WARN.Printf("found MessageID, will upsert: %d",
uuid)
msgToInsert.ID = uuid
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment