Added init() for timeout

lib/constants.go

@@ -1,12 +1,20 @@
 package libunlynx
 
 import (
+	"os"
 	"sync"
 	"time"
 
 	"go.dedis.ch/onet/v3/simul/monitor"
 )
 
+func init() {
+	tmp, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
+	if err != nil {
+		TIMEOUT = tmp
+	}
+}
+
 // Global Variables
 //______________________________________________________________________________________________________________________
 

protocols/collective_aggregation_protocol.go

@@ -9,7 +9,6 @@ package protocolsunlynx
 
 import (
 	"errors"
-	"os"
 	"sync"
 	"time"
 
@@ -197,19 +196,14 @@ 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() {
 			if err := p.SendToChildren(&dataReferenceMessage.DataReferenceMessage); err != nil {
 				return errors.New("Error sending <DataReferenceMessage>:" + err.Error())
 			}
 		}
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <dataReferenceMessage> on time.")
 	}
 	return nil

protocols/deterministic_tagging_protocol.go

@@ -8,7 +8,6 @@ package protocolsunlynx
 
 import (
 	"errors"
-	"os"
 	"sync"
 	"time"
 
@@ -155,21 +154,16 @@ func (p *DeterministicTaggingProtocol) Start() error {
 func (p *DeterministicTaggingProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	//************ ----- first round, add value derivated from ephemeral secret to message ---- ********************
 	var deterministicTaggingTargetBytesBef deterministicTaggingBytesStruct
 	select {
 	case deterministicTaggingTargetBytesBef = <-p.PreviousNodeInPathChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <deterministicTaggingTargetBytesBef> (first round) on time.")
 	}
 
 	deterministicTaggingTargetBef := DeterministicTaggingMessage{Data: make([]libunlynx.CipherText, 0)}
-	err = deterministicTaggingTargetBef.FromBytes(deterministicTaggingTargetBytesBef.Data)
+	err := deterministicTaggingTargetBef.FromBytes(deterministicTaggingTargetBytesBef.Data)
 	if err != nil {
 		return err
 	}
@@ -217,7 +211,7 @@ func (p *DeterministicTaggingProtocol) Dispatch() error {
 	var deterministicTaggingTargetBytes deterministicTaggingBytesStruct
 	select {
 	case deterministicTaggingTargetBytes = <-p.PreviousNodeInPathChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <deterministicTaggingTargetBytes> (second round) on time.")
 	}
 

protocols/key_switching_protocol.go

@@ -8,7 +8,6 @@ package protocolsunlynx
 
 import (
 	"errors"
-	"os"
 	"time"
 
 	"github.com/ldsec/unlynx/lib"
@@ -231,15 +230,10 @@ func (p *KeySwitchingProtocol) Dispatch() error {
 
 // Announce forwarding down the tree.
 func (p *KeySwitchingProtocol) announcementKSPhase() (kyber.Point, []kyber.Point, error) {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var dataReferenceMessage DownBytesStruct
 	select {
 	case dataReferenceMessage = <-p.DownChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return nil, nil, errors.New(p.ServerIdentity().String() + "didn't get the <dataReferenceMessage> on time.")
 	}
 

protocols/shuffling+ddt_protocol.go

@@ -154,22 +154,17 @@ func (p *ShufflingPlusDDTProtocol) Start() error {
 func (p *ShufflingPlusDDTProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var shufflingPlusDDTBytesMessageLength shufflingPlusDDTBytesLengthStruct
 	select {
 	case shufflingPlusDDTBytesMessageLength = <-p.LengthNodeChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <shufflingPlusDDTBytesMessageLength> on time.")
 	}
 
 	var tmp shufflingPlusDDTBytesStruct
 	select {
 	case tmp = <-p.PreviousNodeInPathChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <tmp> on time.")
 	}
 

protocols/shuffling_protocol.go

@@ -5,7 +5,6 @@ package protocolsunlynx
 
 import (
 	"errors"
-	"os"
 	"time"
 
 	"github.com/ldsec/unlynx/lib"
@@ -188,22 +187,17 @@ func (p *ShufflingProtocol) Start() error {
 func (p *ShufflingProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var shufflingBytesMessageLength shufflingBytesLengthStruct
 	select {
 	case shufflingBytesMessageLength = <-p.LengthNodeChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <shufflingBytesMessageLength> on time.")
 	}
 
 	var tmp shufflingBytesStruct
 	select {
 	case tmp = <-p.PreviousNodeInPathChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <tmp> on time.")
 	}
 

protocols/utils/addrm_server_protocol.go

@@ -5,7 +5,6 @@ package protocolsunlynxutils
 
 import (
 	"errors"
-	"os"
 	"sync"
 	"time"
 
@@ -94,15 +93,10 @@ func (p *AddRmServerProtocol) Start() error {
 func (p *AddRmServerProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var finalResultMessage []libunlynx.CipherText
 	select {
 	case finalResultMessage = <-finalResultAddrm:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
 	}
 

protocols/utils/local_aggregation_protocol.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ldsec/unlynx/lib/aggregation"
 	"go.dedis.ch/onet/v3"
 	"go.dedis.ch/onet/v3/log"
-	"os"
 	"time"
 )
 
@@ -85,15 +84,10 @@ func (p *LocalAggregationProtocol) Start() error {
 func (p *LocalAggregationProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var finalResultMessage map[libunlynx.GroupingKey]libunlynx.FilteredResponse
 	select {
 	case finalResultMessage = <-finalResultAggr:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
 	}
 

protocols/utils/local_clear_aggregation_protocol.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ldsec/unlynx/lib/store"
 	"go.dedis.ch/onet/v3"
 	"go.dedis.ch/onet/v3/log"
-	"os"
 	"time"
 )
 
@@ -59,15 +58,10 @@ func (p *LocalClearAggregationProtocol) Start() error {
 func (p *LocalClearAggregationProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var finalResultMessage []libunlynx.DpClearResponse
 	select {
 	case finalResultMessage = <-finalResultClearAggr:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
 	}
 

protocols/utils/proofs_verification_protocol.go

@@ -13,7 +13,6 @@ import (
 	"github.com/ldsec/unlynx/lib/shuffle"
 	"go.dedis.ch/onet/v3"
 	"go.dedis.ch/onet/v3/log"
-	"os"
 	"time"
 )
 
@@ -110,15 +109,10 @@ func (p *ProofsVerificationProtocol) Start() error {
 func (p *ProofsVerificationProtocol) Dispatch() error {
 	defer p.Done()
 
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	var finalResultMessage []bool
 	select {
 	case finalResultMessage = <-finalResult:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(p.ServerIdentity().String() + "didn't get the <finalResultMessage> on time.")
 	}
 

services/service.go

@@ -2,7 +2,6 @@ package servicesunlynx
 
 import (
 	"errors"
-	"os"
 	"strconv"
 	"time"
 
@@ -715,11 +714,6 @@ func (s *Service) StartService(targetSurvey SurveyID, root bool) error {
 
 // ShufflingPhase performs the shuffling of the ClientResponses
 func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	survey, err := s.getSurvey(targetSurvey)
 	if err != nil {
 		return err
@@ -738,7 +732,7 @@ func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {
 	var tmpShufflingResult []libunlynx.CipherVector
 	select {
 	case tmpShufflingResult = <-pi.(*protocolsunlynx.ShufflingProtocol).FeedbackChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(s.ServerIdentity().String() + "didn't get the <tmpShufflingResult> on time.")
 	}
 
@@ -755,11 +749,6 @@ func (s *Service) ShufflingPhase(targetSurvey SurveyID) error {
 
 // TaggingPhase performs the private grouping on the currently collected data.
 func (s *Service) TaggingPhase(targetSurvey SurveyID) error {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	survey, err := s.getSurvey(targetSurvey)
 	if err != nil {
 		return err
@@ -778,7 +767,7 @@ func (s *Service) TaggingPhase(targetSurvey SurveyID) error {
 	var tmpDeterministicTaggingResult []libunlynx.DeterministCipherText
 	select {
 	case tmpDeterministicTaggingResult = <-pi.(*protocolsunlynx.DeterministicTaggingProtocol).FeedbackChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(s.ServerIdentity().String() + "didn't get the <tmpDeterministicTaggingResult> on time.")
 	}
 
@@ -809,11 +798,6 @@ func (s *Service) TaggingPhase(targetSurvey SurveyID) error {
 
 // AggregationPhase performs the per-group aggregation on the currently grouped data.
 func (s *Service) AggregationPhase(targetSurvey SurveyID) error {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	pi, err := s.StartProtocol(protocolsunlynx.CollectiveAggregationProtocolName, targetSurvey)
 	if err != nil {
 		return err
@@ -822,7 +806,7 @@ func (s *Service) AggregationPhase(targetSurvey SurveyID) error {
 	var cothorityAggregatedData protocolsunlynx.CothorityAggregatedData
 	select {
 	case cothorityAggregatedData = <-pi.(*protocolsunlynx.CollectiveAggregationProtocol).FeedbackChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(s.ServerIdentity().String() + "didn't get the <cothorityAggregatedData> on time.")
 	}
 
@@ -838,11 +822,6 @@ func (s *Service) AggregationPhase(targetSurvey SurveyID) error {
 
 // DROPhase shuffles the list of noise values.
 func (s *Service) DROPhase(targetSurvey SurveyID) error {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	pi, err := s.StartProtocol(protocolsunlynx.DROProtocolName, targetSurvey)
 	if err != nil {
 		return err
@@ -856,7 +835,7 @@ func (s *Service) DROPhase(targetSurvey SurveyID) error {
 	var tmpShufflingResult []libunlynx.CipherVector
 	select {
 	case tmpShufflingResult = <-pi.(*protocolsunlynx.ShufflingProtocol).FeedbackChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(s.ServerIdentity().String() + "didn't get the <tmpShufflingResult> on time.")
 	}
 
@@ -869,11 +848,6 @@ func (s *Service) DROPhase(targetSurvey SurveyID) error {
 
 // KeySwitchingPhase performs the switch to the querier's key on the currently aggregated data.
 func (s *Service) KeySwitchingPhase(targetSurvey SurveyID) error {
-	timeout, err := time.ParseDuration(os.Getenv("MEDCO_TIMEOUT"))
-	if err != nil {
-		timeout = libunlynx.TIMEOUT
-	}
-
 	pi, err := s.StartProtocol(protocolsunlynx.KeySwitchingProtocolName, targetSurvey)
 	if err != nil {
 		return err
@@ -887,7 +861,7 @@ func (s *Service) KeySwitchingPhase(targetSurvey SurveyID) error {
 	var tmpKeySwitchedAggregatedResponses libunlynx.CipherVector
 	select {
 	case tmpKeySwitchedAggregatedResponses = <-pi.(*protocolsunlynx.KeySwitchingProtocol).FeedbackChannel:
-	case <-time.After(timeout):
+	case <-time.After(libunlynx.TIMEOUT):
 		return errors.New(s.ServerIdentity().String() + "didn't get the <tmpKeySwitchedAggregatedResponses> on time.")
 	}