Timeout #38
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ test_lint: | |
| } | ||
|
|
||
| test_local: | ||
| go test -v -short -race -p=1 ./... | ||
|
|
||
| test_codecov: | ||
| ./coveralls.sh | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,23 @@ | ||
| module github.com/ldsec/unlynx | ||
|
|
||
| go 1.14 | ||
|
|
||
| require ( | ||
| github.com/BurntSushi/toml v0.3.1 | ||
| github.com/Knetic/govaluate v3.0.0+incompatible | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect | ||
| github.com/fanliao/go-concurrentMap v0.0.0-20141114143905-7d2d7a5ea67b | ||
| github.com/gorilla/websocket v1.4.1 // indirect | ||
| github.com/montanaflynn/stats v0.6.3 // indirect | ||
| github.com/r0fls/gostats v0.0.0-20180711082619-e793b1fda35c | ||
| github.com/satori/go.uuid v1.2.0 | ||
| github.com/stretchr/testify v1.4.0 | ||
| github.com/urfave/cli v1.22.3 | ||
| go.dedis.ch/kyber/v3 v3.0.12 | ||
| go.dedis.ch/onet/v3 v3.1.0 | ||
| golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect | ||
| golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect | ||
| golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect | ||
| ) | ||
|
|
||
| //replace go.dedis.ch/onet/v3 => ../../../go.dedis.ch/onet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -9,7 +9,9 @@ package protocolsunlynx | |||||
|
|
||||||
| import ( | ||||||
| "errors" | ||||||
| "os" | ||||||
| "sync" | ||||||
| "time" | ||||||
|
|
||||||
| "github.com/ldsec/unlynx/lib" | ||||||
| "github.com/ldsec/unlynx/lib/aggregation" | ||||||
|
|
@@ -195,11 +197,20 @@ func (p *CollectiveAggregationProtocol) Dispatch() error { | |||||
|
|
||||||
| // Announce forwarding down the tree. | ||||||
| func (p *CollectiveAggregationProtocol) aggregationAnnouncementPhase() error { | ||||||
| timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT")) | ||||||
| if err != nil { | ||||||
| timeout = libunlynx.TIMEOUT | ||||||
| } | ||||||
|
|
||||||
| select { | ||||||
| case dataReferenceMessage := <-p.DataReferenceChannel: | ||||||
| if !p.IsLeaf() { | ||||||
|
There was a problem hiding this comment. Unneded if, There was a problem hiding this comment. Arf, I misexplained it; the There was a problem hiding this comment. ahh I did not get it :P |
||||||
| if err := p.SendToChildren(&dataReferenceMessage.DataReferenceMessage); err != nil { | ||||||
| return errors.New("Error sending <DataReferenceMessage>:" + err.Error()) | ||||||
|
There was a problem hiding this comment. You can use the new
Suggested change
There was a problem hiding this comment. switched everywhere to fmt.Errorf: 8861342 |
||||||
| } | ||||||
| } | ||||||
| case <-time.After(timeout): | ||||||
| return errors.New(p.ServerIdentity().String() + "didn't get the <dataReferenceMessage> on time.") | ||||||
| } | ||||||
| return nil | ||||||
| } | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be enough to put this in a
func init()at the beginning of the fileconstants.go. Then you can remove it from all the methods you're calling it...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done abbe277