Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
client
Commits
a6fae831
Commit
a6fae831
authored
Dec 17, 2021
by
Jonah Husson
Browse files
Options
Downloads
Patches
Plain Diff
Apply sendcmix changes to sendmanycmix
parent
7c6fb178
No related branches found
No related tags found
2 merge requests
!117
Release
,
!86
M203/excluded rounds
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
network/message/sendManyCmix.go
+8
-5
8 additions, 5 deletions
network/message/sendManyCmix.go
with
8 additions
and
5 deletions
network/message/sendManyCmix.go
+
8
−
5
View file @
a6fae831
...
@@ -101,8 +101,14 @@ func sendManyCmixHelper(sender *gateway.Sender,
...
@@ -101,8 +101,14 @@ func sendManyCmixHelper(sender *gateway.Sender,
attempted
.
Insert
(
bestRound
)
attempted
.
Insert
(
bestRound
)
// Check excluded rounds for the selected best round
// Check excluded rounds for the selected best round
if
param
.
UseExcluded
&&
param
.
ExcludedRounds
!=
nil
&&
param
.
ExcludedRounds
.
Has
(
bestRound
.
GetRoundId
())
{
if
param
.
UseExcluded
&&
param
.
ExcludedRounds
!=
nil
{
if
param
.
ExcludedRounds
.
Has
(
bestRound
.
GetRoundId
())
{
jww
.
WARN
.
Printf
(
"Round %d is excluded, skipping..."
,
bestRound
.
ID
)
continue
continue
}
else
{
param
.
ExcludedRounds
.
Insert
(
bestRound
.
GetRoundId
())
jww
.
WARN
.
Printf
(
"Added %d to excluded rounds"
,
bestRound
.
ID
)
}
}
}
// Determine whether the selected round contains any nodes that are
// Determine whether the selected round contains any nodes that are
...
@@ -204,9 +210,6 @@ func sendManyCmixHelper(sender *gateway.Sender,
...
@@ -204,9 +210,6 @@ func sendManyCmixHelper(sender *gateway.Sender,
// Return if it sends properly
// Return if it sends properly
gwSlotResp
:=
result
.
(
*
pb
.
GatewaySlotResponse
)
gwSlotResp
:=
result
.
(
*
pb
.
GatewaySlotResponse
)
if
gwSlotResp
.
Accepted
{
if
gwSlotResp
.
Accepted
{
if
param
.
UseExcluded
&&
param
.
ExcludedRounds
!=
nil
{
param
.
ExcludedRounds
.
Insert
(
bestRound
.
GetRoundId
())
}
m
:=
fmt
.
Sprintf
(
"Successfully sent to EphIDs %s (sources: [%s]) "
+
m
:=
fmt
.
Sprintf
(
"Successfully sent to EphIDs %s (sources: [%s]) "
+
"in round %d"
,
ephemeralIDsString
,
recipientString
,
bestRound
.
ID
)
"in round %d"
,
ephemeralIDsString
,
recipientString
,
bestRound
.
ID
)
jww
.
INFO
.
Print
(
m
)
jww
.
INFO
.
Print
(
m
)
...
...
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
register
or
sign in
to comment