Skip to content
Snippets Groups Projects
Commit f2f9d37c authored by Jake Taylor's avatar Jake Taylor
Browse files

fix tests

parent 9defac38
Branches
Tags
3 merge requests!233Modify restore to call user-defined bindings callback. Add Sent requests to...,!231Revert "Update store to print changes to the partners list",!222Hotfix/dropped grp message
...@@ -119,7 +119,9 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge ...@@ -119,7 +119,9 @@ func (m *Manager) handleMessage(ecrMsg format.Message, bundle Bundle, edge *edge
Encryption: message.None, Encryption: message.None,
RecipientID: identity.Source, RecipientID: identity.Source,
RoundId: id.Round(bundle.RoundInfo.ID), RoundId: id.Round(bundle.RoundInfo.ID),
RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.QUEUED])), // We use PRECOMPUTING here because all Rounds have that timestamp available to them
// QUEUED can be missing sometimes and cause a lot of hidden problems further down the line
RoundTimestamp: time.Unix(0, int64(bundle.RoundInfo.Timestamps[states.PRECOMPUTING])),
} }
im := fmt.Sprintf("Received message of type Garbled/RAW: keyFP: %v, round: %d, "+ im := fmt.Sprintf("Received message of type Garbled/RAW: keyFP: %v, round: %d, "+
"msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest()) "msgDigest: %s", msg.GetKeyFP(), bundle.Round, msg.Digest())
......
...@@ -13,7 +13,6 @@ import ( ...@@ -13,7 +13,6 @@ import (
"gitlab.com/elixxir/client/stoppable" "gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/client/storage/reception" "gitlab.com/elixxir/client/storage/reception"
pb "gitlab.com/elixxir/comms/mixmessages" pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/id"
"time" "time"
...@@ -123,7 +122,7 @@ func (m *Manager) processHistoricalRounds(comm historicalRoundsComms, stop *stop ...@@ -123,7 +122,7 @@ func (m *Manager) processHistoricalRounds(comm historicalRoundsComms, stop *stop
// The interface has missing returns returned as nil, such roundRequests // The interface has missing returns returned as nil, such roundRequests
// need to be removes as processing so the network follower will // need to be removes as processing so the network follower will
// pick them up in the future. // pick them up in the future.
if roundInfo == nil || roundInfo.State != uint32(states.COMPLETED) { if roundInfo == nil {
var errMsg string var errMsg string
roundRequests[i].numAttempts++ roundRequests[i].numAttempts++
if roundRequests[i].numAttempts == m.params.MaxHistoricalRoundsRetries { if roundRequests[i].numAttempts == m.params.MaxHistoricalRoundsRetries {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment