Skip to content
Snippets Groups Projects
Commit 822ad5aa authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

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

# Conflicts:
#	network/follow.go
#	network/rounds/check.go
#	network/rounds/processingRounds.go
parents 506aa0b2 18d219f9
No related branches found
No related tags found
No related merge requests found
Showing
with 110 additions and 115 deletions
......@@ -46,5 +46,3 @@ func (spl serviceProcessiesList)run(m *stoppable.Multi){
spl.multiStopable.Add(sp())
}
}
// Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at
// 2021-02-15 13:16:40.214748 -0600 CST m=+0.021065952
// 2021-02-23 13:45:01.90479 -0600 CST m=+0.028659802
package globals
const GITVERSION = `e5e78f6b fixed the useage of the excluded list in send cMix`
const GITVERSION = `52999989 added better logging on send`
const SEMVER = "1.4.0"
const DEPENDENCIES = `module gitlab.com/elixxir/client
......@@ -24,16 +24,16 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/viper v1.7.1
gitlab.com/elixxir/bloomfilter v0.0.0-20200930191214-10e9ac31b228
gitlab.com/elixxir/comms v0.0.4-0.20210215180544-d672a6bfd53a
gitlab.com/elixxir/crypto v0.0.7-0.20210210215733-951b4e717763
gitlab.com/elixxir/ekv v0.1.4
gitlab.com/elixxir/primitives v0.0.3-0.20210210215643-bf48247248e5
gitlab.com/xx_network/comms v0.0.4-0.20210210215624-622913c0a215
gitlab.com/xx_network/crypto v0.0.5-0.20210210215543-446333e9022e
gitlab.com/xx_network/primitives v0.0.4-0.20210215191517-2f56b21d6ed7
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
gitlab.com/elixxir/comms v0.0.4-0.20210223192051-a47bfe7991e8
gitlab.com/elixxir/crypto v0.0.7-0.20210216174551-f806f79610eb
gitlab.com/elixxir/ekv v0.1.5-0.20210223193853-5f54e289198f
gitlab.com/elixxir/primitives v0.0.3-0.20210223180234-8e5d82635c20
gitlab.com/xx_network/comms v0.0.4-0.20210216174438-0790d1f1f225
gitlab.com/xx_network/crypto v0.0.5-0.20210216174356-e81e1ddf8fb7
gitlab.com/xx_network/primitives v0.0.4-0.20210219231511-983054dbee36
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
golang.org/x/sys v0.0.0-20210105210732-16f7687f5001 // indirect
golang.org/x/sys v0.0.0-20210223095934-7937bea0104d // indirect
google.golang.org/genproto v0.0.0-20210105202744-fe13368bc0e1 // indirect
google.golang.org/grpc v1.34.0 // indirect
google.golang.org/protobuf v1.25.0
......
......@@ -71,7 +71,6 @@ func (m *manager) followNetwork(quitCh <-chan struct{}) {
// executes each iteration of the follower
func (m *manager) follow(rng csprng.Source, comms followNetworkComms) {
//get the identity we will poll for
identity, err := m.Session.Reception().GetIdentity(rng)
if err != nil {
......@@ -251,5 +250,4 @@ func (m *manager) follow(rng csprng.Source, comms followNetworkComms) {
m.round.DeleteProcessingRoundDelete(i, identity.EphId, identity.Source)
}
}
}
......@@ -8,10 +8,10 @@
package message
import (
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/interfaces/message"
"gitlab.com/elixxir/primitives/format"
"time"
jww "github.com/spf13/jwalterweatherman"
)
// Messages can arrive in the network out of order. When message handling fails
......
......@@ -58,7 +58,7 @@ func (m *Manager) handleMessage(ecrMsg format.Message, identity reception.Identi
identity.Source)
jww.TRACE.Printf("Message for %d (%s) failed identity "+
"check: %v (expected) vs %v (received)", identity.EphId,
identity.Source, expectedFP, ecrMsg.GetIdentityFP(), )
identity.Source, expectedFP, ecrMsg.GetIdentityFP())
}
return
......
......@@ -73,7 +73,6 @@ func sendCmixHelper(msg format.Message, recipient *id.ID, param params.CMIX, ins
msg.Digest())
}
remainingTime := param.Timeout - elapsed
//find the best round to send to, excluding attempted rounds
bestRound, _ := instance.GetWaitingRounds().GetUpcomingRealtime(remainingTime, attempted)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment