Remove commented out code sections

Author: JoaoAndreSa

data/handle_data.go

@@ -16,9 +16,6 @@ import (
 	"go.dedis.ch/onet/v3/log"
 )
 
-// Groups identifies all different groups to be added to the test data file
-//var Groups [][]int64
-
 // FillInt64Slice fills a slice with the same value v
 func FillInt64Slice(s []int64, v int64) {
 	for i := 0; i < len(s); i++ {
@@ -111,8 +108,6 @@ func GenerateData(numDPs, numEntries, numEntriesFiltered, numGroupsClear, numGro
 			aggr := make([]int64, numAggrEnc+numAggrClear)
 
 			// Toggle random data or not (2 -> just 0's or 1's)
-
-			//FillInt64Slice(aggr,int64(1))
 			randomFillInt64Slice(aggr, 2)
 
 			grp := make([]int64, numGroupsClear+numGroupsEnc)

lib/crypto.go

@@ -20,7 +20,6 @@ import (
 const MaxHomomorphicInt int64 = 100000
 
 // PointToInt creates a map between EC points and integers.
-//var PointToInt = make(map[string]int64, MaxHomomorphicInt)
 var PointToInt = concurrent.NewConcurrentMap()
 var currentGreatestM kyber.Point
 var currentGreatestInt int64

lib/structs_test.go

@@ -29,7 +29,6 @@ func TestAddClientResponse(t *testing.T) {
 	newCr.AggregatingAttributes = *libunlynx.NewCipherVector(len(cr1.AggregatingAttributes))
 	newCr.Add(cr1, cr2)
 
-	//assert.Equal(t, grouping, lib.UnKey(newCr.GroupingAttributesClear))
 	assert.Equal(t, sum, libunlynx.DecryptIntVector(secKey, &newCr.AggregatingAttributes))
 	assert.Equal(t, grouping, libunlynx.DecryptIntVector(secKey, &newCr.GroupByEnc))
 }

protocols/collective_aggregation_protocol.go

@@ -59,8 +59,7 @@ type ChildAggregatedDataBytesMessage struct {
 type CADBLengthMessage struct {
 	GacbLength int
 	AabLength  int
-	//PgaebLength int
-	DtbLength int
+	DtbLength  int
 }
 
 // Structs
@@ -308,7 +307,6 @@ func (sm *ChildAggregatedDataMessage) ToBytes() ([]byte, int, int, int) {
 
 	var gacbLength int
 	var aabLength int
-	//var pgaebLength int
 	var dtbLength int
 
 	wg := libunlynx.StartParallelize(len((*sm).ChildData))

protocols/deterministic_tagging_protocol.go

@@ -309,8 +309,6 @@ func (dtm *DeterministicTaggingMessage) ToBytes() []byte {
 
 // FromBytes converts a byte array to a DeterministicTaggingMessage. Note that you need to create the (empty) object beforehand.
 func (dtm *DeterministicTaggingMessage) FromBytes(data []byte) {
-
-	//cvLengths := UnsafeCastBytesToInts(cvLengthsByte)
 	elementSize := libunlynx.CipherTextByteSize()
 	(*dtm).Data = make([]libunlynx.CipherText, len(data)/elementSize)
 

protocols/deterministic_tagging_test.go

@@ -34,7 +34,7 @@ func TestDeterministicTagging(t *testing.T) {
 
 	aggregateKey := entityList.Aggregate
 
-	//create data for test
+	// create data for test
 	testCipherVect := make(libunlynx.CipherVector, 1)
 	expRes := []int64{1}
 	for i, p := range expRes {

protocols/key_switching_protocol.go

@@ -140,7 +140,7 @@ func NewKeySwitchingProtocol(n *onet.TreeNodeInstance) (onet.ProtocolInstance, e
 // Start is called at the root to begin the execution of the protocol.
 func (p *KeySwitchingProtocol) Start() error {
 
-	//keySwitchingStart := libunlynx.StartTimer(p.Name() + "_KeySwitching(START)")
+	keySwitchingStart := libunlynx.StartTimer(p.Name() + "_KeySwitching(START)")
 
 	if p.TargetOfSwitch == nil {
 		return errors.New("no ciphertext given as key switching target")
@@ -173,7 +173,7 @@ func (p *KeySwitchingProtocol) Start() error {
 		log.Fatal("Root " + p.ServerIdentity().String() + " failed to broadcast DownMessageBytes")
 	}
 
-	//libunlynx.EndTimer(keySwitchingStart)
+	libunlynx.EndTimer(keySwitchingStart)
 
 	return nil
 }
@@ -230,7 +230,7 @@ func (p *KeySwitchingProtocol) announcementKSPhase() (kyber.Point, []kyber.Point
 // Results pushing up the tree containing key switching results.
 func (p *KeySwitchingProtocol) ascendingKSPhase() *libunlynx.CipherVector {
 
-	//keySwitchingAscendingAggregation := libunlynx.StartTimer(p.Name() + "_KeySwitching(ascendingAggregation)")
+	keySwitchingAscendingAggregation := libunlynx.StartTimer(p.Name() + "_KeySwitching(ascendingAggregation)")
 
 	if !p.IsLeaf() {
 		length := make([]LengthStruct, 0)
@@ -252,7 +252,7 @@ func (p *KeySwitchingProtocol) ascendingKSPhase() *libunlynx.CipherVector {
 		}
 	}
 
-	//libunlynx.EndTimer(keySwitchingAscendingAggregation)
+	libunlynx.EndTimer(keySwitchingAscendingAggregation)
 
 	if !p.IsRoot() {
 		if err := p.SendToParent(&LengthMessage{Length: libunlynxtools.UnsafeCastIntsToBytes([]int{len(*p.NodeContribution)})}); err != nil {

protocols/shuffling_protocol.go

@@ -122,7 +122,7 @@ func NewShufflingProtocol(n *onet.TreeNodeInstance) (onet.ProtocolInstance, erro
 // Start is called at the root node and starts the execution of the protocol.
 func (p *ShufflingProtocol) Start() error {
 
-	//shufflingStart := libunlynx.StartTimer(p.Name() + "_Shuffling(START)")
+	shufflingStart := libunlynx.StartTimer(p.Name() + "_Shuffling(START)")
 
 	if p.ShuffleTarget == nil {
 		return errors.New("no map given as shuffling target")
@@ -153,14 +153,14 @@ func (p *ShufflingProtocol) Start() error {
 
 	libunlynx.EndTimer(shufflingStartNoProof)
 
-	//shufflingStartProof := libunlynx.StartTimer(p.Name() + "_Shuffling(START-Proof)")
+	shufflingStartProof := libunlynx.StartTimer(p.Name() + "_Shuffling(START-Proof)")
 
 	if p.Proofs {
 		p.ProofFunc(shuffleTarget, shuffledData, collectiveKey, beta, pi)
 	}
 
-	//libunlynx.EndTimer(shufflingStartProof)
-	//libunlynx.EndTimer(shufflingStart)
+	libunlynx.EndTimer(shufflingStartProof)
+	libunlynx.EndTimer(shufflingStart)
 
 	p.ExecTimeStart += time.Since(timer)
 
@@ -186,7 +186,7 @@ func (p *ShufflingProtocol) Dispatch() error {
 	shuffleTarget := sm.Data
 
 	timer := time.Now()
-	//shufflingDispatch := libunlynx.StartTimer(p.Name() + "_Shuffling(DISPATCH)")
+	shufflingDispatch := libunlynx.StartTimer(p.Name() + "_Shuffling(DISPATCH)")
 
 	collectiveKey := p.Roster().Aggregate
 	// when testing protocol
@@ -203,19 +203,19 @@ func (p *ShufflingProtocol) Dispatch() error {
 	var beta [][]kyber.Scalar
 
 	if !p.IsRoot() {
-		//shufflingDispatchNoProof := libunlynx.StartTimer(p.Name() + "_Shuffling(DISPATCH-noProof)")
+		shufflingDispatchNoProof := libunlynx.StartTimer(p.Name() + "_Shuffling(DISPATCH-noProof)")
 
 		shuffledData, pi, beta = libunlynxshuffle.ShuffleSequence(shuffleTarget, libunlynx.SuiTe.Point().Base(), collectiveKey, p.Precomputed)
 
-		//libunlynx.EndTimer(shufflingDispatchNoProof)
+		libunlynx.EndTimer(shufflingDispatchNoProof)
 
-		//shufflingDispatchProof := libunlynx.StartTimer("_Shuffling(DISPATCH-Proof)")
+		shufflingDispatchProof := libunlynx.StartTimer("_Shuffling(DISPATCH-Proof)")
 
 		if p.Proofs {
 			p.ProofFunc(shuffleTarget, shuffledData, collectiveKey, beta, pi)
 		}
 
-		//libunlynx.EndTimer(shufflingDispatchProof)
+		libunlynx.EndTimer(shufflingDispatchProof)
 
 	}
 
@@ -227,7 +227,7 @@ func (p *ShufflingProtocol) Dispatch() error {
 		log.Lvl1(p.ServerIdentity(), " carried on shuffling.")
 	}
 
-	//libunlynx.EndTimer(shufflingDispatch)
+	libunlynx.EndTimer(shufflingDispatch)
 
 	// If this tree node is the root, then protocol reached the end.
 	if p.IsRoot() {

services/api.go

@@ -91,7 +91,6 @@ func (c *API) SendSurveyResultsQuery(surveyID SurveyID) (*[][]int64, *[][]int64,
 
 	log.Lvl1(c, " got the survey result from ", c.entryPoint)
 
-	//grpClear := make([][]int64, len(resp.Results))
 	grp := make([][]int64, len(resp.Results))
 	aggr := make([][]int64, len(resp.Results))
 	for i, res := range resp.Results {

services/service_test.go

@@ -167,8 +167,6 @@ func TestServiceClearAttr(t *testing.T) {
 		for j := 0; j < numberAttr; j++ {
 			aggr["s"+strconv.Itoa(j+1)] = int64(j)
 		}
-
-		//responses:= []lib.DpClearResponse{{WhereClear: sliceWhere, GroupByClear: sliceGrp, AggregatingAttributesEnc: aggr},{WhereClear: sliceWhere, GroupByClear: sliceGrp, AggregatingAttributesEnc: aggr},{WhereClear: sliceWhere, GroupByClear: sliceGrp1, AggregatingAttributesEnc: aggr}}
 		responses := []libunlynx.DpClearResponse{{WhereClear: sliceWhere, GroupByClear: sliceGrp, AggregatingAttributesEnc: aggr}, {WhereClear: sliceWhere, GroupByClear: sliceGrp, AggregatingAttributesEnc: aggr}}
 
 		log.Lvl1(responses)
@@ -179,7 +177,6 @@ func TestServiceClearAttr(t *testing.T) {
 	}
 
 	expectedResults[[3]int64{0, 1, 2}] = []int64{0, 18}
-	//expectedResults[[3]int64{1,2,3}] = []int64{0,9}
 	grp, aggr, err := client.SendSurveyResultsQuery(*surveyID)
 
 	if err != nil {

simul/proofs_verification_simul.go

@@ -170,7 +170,6 @@ func (sim *ProofsVerificationSimulation) Run(config *onet.SimulationConfig) erro
 		}
 
 		//shuffling ****************************************************************************************************
-
 		log.Lvl1("Starting shuffling (can take some time)")
 		responsesToShuffle := make([]libunlynx.ProcessResponse, sim.NbrResponses/sim.NbrServers)
 		for i := 0; i < sim.NbrResponses/sim.NbrServers; i++ {

simul/unlynx_simul.go

@@ -131,9 +131,6 @@ func (sim *SimulationUnLynx) Run(config *onet.SimulationConfig) error {
 		testData := dataunlynx.GenerateData(int64(sim.NbrDPs), sim.NbrResponsesTot, sim.NbrResponsesFiltered, sim.NbrGroupsClear, sim.NbrGroupsEnc,
 			sim.NbrWhereClear, sim.NbrWhereEncrypted, sim.NbrAggrClear, sim.NbrAggrEncrypted, sim.NbrGroupAttributes, sim.RandomGroups)
 
-		/*log.Lvl1("Saving test data...")
-		data.WriteDataToFile("unlynx_test_data.txt", testData)*/
-
 		/// START SERVICE PROTOCOL
 		if libunlynx.TIME {
 			start = monitor.NewTimeMeasure("SendingData")