Merge pull request #14 from lca1/homoProto

unlynx_v2 the big and great cleanup

Author: JoaoAndreSa

.gitignore

@@ -30,29 +30,17 @@ _testmain.go
 
 .idea/
 
-services/default/data/*.txt
-services/unlynxMedCo/*.toml
+data/*.txt
 
 simul/test_data/*.csv
 simul/test_data/graphs/*.pdf
 simul/test_data/time_data/*.txt
 simul/build/
 simul/deploy/
 simul/simul
-simul/deter.toml
-
-app/default/*.toml
-app/default/test
-app/default/service_storage
-app/unlynxMedCo/*.toml
-app/unlynxMedCo/loader/files/*
-app/unlynxMedCo/loader/26-load-data.sh
-app/unlynxMedCo/loader/*.toml
-app/unlynxMedCo/loader/*.txt
-app/unlynxMedCo/graphs/*.pdf
 
 unlynx
-#unlynxMedCo
+app/unlynx
 server_list
 
 pre_compute_multiplications.gob

.travis.yml

@@ -6,14 +6,11 @@ go:
 env:
   - GO111MODULE=on
 
-install:
-  - go get -t ./...
-
 script:
-  - make test
+  - env GO111MODULE=on make test
 
 after_success:
   - $GOPATH/bin/goveralls -coverprofile=profile.cov -service=travis-ci
 
 notifications:
-  email: false
+  email: false

Makefile

@@ -27,7 +27,7 @@ test_lint:
 	}
 
 test_local:
-	go test -v -race -short -p=1 -tags vartime ./...
+	go test -v -race -short -p=1 ./...
 
 test_codecov:
 	./coveralls.sh

app/client.go

@@ -1,39 +1,38 @@
 package appunlynx
 
 import (
+	"errors"
 	"os"
+	"regexp"
+	"strconv"
+	"strings"
 
-	"github.com/btcsuite/goleveldb/leveldb/errors"
 	"github.com/lca1/unlynx/lib"
-	"github.com/lca1/unlynx/services/default"
+	"github.com/lca1/unlynx/services"
 	"go.dedis.ch/onet/v3"
 	"go.dedis.ch/onet/v3/app"
 	"go.dedis.ch/onet/v3/log"
 	"gopkg.in/urfave/cli.v1"
-	"regexp"
-	"strconv"
-	"strings"
 )
 
 // BEGIN CLIENT: QUERIER ----------
-func startQuery(el *onet.Roster, proofs bool, sum []string, count bool, whereQueryValues []libunlynx.WhereQueryAttribute, predicate string, groupBy []string) {
-	client := servicesunlynxdefault.NewUnLynxClient(el.List[0], strconv.Itoa(0))
+func startQuery(el *onet.Roster, proofs bool, sum []string, count bool, whereQueryValues []libunlynx.WhereQueryAttribute, predicate string, groupBy []string) error {
+	client := servicesunlynx.NewUnLynxClient(el.List[0], strconv.Itoa(0))
 
-	// Generate Survey Data
 	nbrDPs := make(map[string]int64)
 	//how many data providers for each server
 	for _, server := range el.List {
 		nbrDPs[server.String()] = 1 // 1 DP for each server
 	}
 
-	surveyID, err := client.SendSurveyCreationQuery(el, servicesunlynxdefault.SurveyID(""), nil, nbrDPs, proofs, true, sum, count, whereQueryValues, predicate, groupBy)
+	surveyID, err := client.SendSurveyCreationQuery(el, servicesunlynx.SurveyID(""), nil, nbrDPs, proofs, true, sum, count, whereQueryValues, predicate, groupBy)
 	if err != nil {
-		log.Fatal("Service did not start.", err)
+		return err
 	}
 
 	grp, aggr, err := client.SendSurveyResultsQuery(*surveyID)
 	if err != nil {
-		log.Fatal("Service could not output the results.")
+		return errors.New("service could not output the results: " + err.Error())
 	}
 
 	// Print Output
@@ -43,9 +42,10 @@ func startQuery(el *onet.Roster, proofs bool, sum []string, count bool, whereQue
 	for i := range tabVerify {
 		log.Lvl1(i, ")", (*grp)[i], "->", (*aggr)[i])
 	}
+	return nil
 }
 
-func runUnLynx(c *cli.Context) error {
+func runUnLynx(c *cli.Context) {
 	tomlFileName := c.String("file")
 
 	proofs := c.Bool("proofs")
@@ -58,14 +58,12 @@ func runUnLynx(c *cli.Context) error {
 	groupBy := c.String("groupBy")
 
 	el, err := openGroupToml(tomlFileName)
-	if err != nil {
-		return err
-	}
+	log.ErrFatal(err, "Could not open group toml.")
 
-	sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal := parseQuery(el, sum, count, whereQueryValues, predicate, groupBy)
-	startQuery(el, proofs, sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal)
+	sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal, err := parseQuery(el, sum, count, whereQueryValues, predicate, groupBy)
 
-	return nil
+	err = startQuery(el, proofs, sumFinal, countFinal, whereFinal, predicateFinal, groupByFinal)
+	log.ErrFatal(err)
 }
 
 func openGroupToml(tomlFileName string) (*onet.Roster, error) {
@@ -79,33 +77,30 @@ func openGroupToml(tomlFileName string) (*onet.Roster, error) {
 	}
 
 	if len(el.Roster.List) <= 0 {
-		return nil, errors.New("Empty or invalid unlynx group file:" + tomlFileName)
+		return nil, errors.New("empty or invalid unlynx group file:" + tomlFileName)
 	}
 
 	return el.Roster, nil
 }
 
-func checkRegex(input, expression, errorMessage string) {
+func checkRegex(input, expression string) bool {
 	var aux = regexp.MustCompile(expression)
-
-	correct := aux.MatchString(input)
-
-	if !correct {
-		log.Fatal(errorMessage)
-	}
+	return aux.MatchString(input)
 }
 
-func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, groupBy string) ([]string, bool, []libunlynx.WhereQueryAttribute, string, []string) {
+func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, groupBy string) ([]string, bool, []libunlynx.WhereQueryAttribute, string, []string, error) {
 
 	if sum == "" || (where != "" && predicate == "") || (where == "" && predicate != "") {
-		log.Fatal("Wrong query! Please check the sum, where and the predicate parameters")
+		return nil, false, nil, "", nil, errors.New("wrong query! please check the sum, where and the predicate parameters")
 	}
 
 	sumRegex := "{s[0-9]+(,\\s*s[0-9]+)*}"
 	whereRegex := "{(w[0-9]+(,\\s*[0-9]+))*(,\\s*w[0-9]+(,\\s*[0-9]+))*}"
 	groupByRegex := "{g[0-9]+(,\\s*g[0-9]+)*}"
 
-	checkRegex(sum, sumRegex, "Error parsing the sum parameter(s)")
+	if !checkRegex(sum, sumRegex) {
+		return nil, false, nil, "", nil, errors.New("error parsing the sum parameter(s)")
+	}
 	sum = strings.Replace(sum, " ", "", -1)
 	sum = strings.Replace(sum, "{", "", -1)
 	sum = strings.Replace(sum, "}", "", -1)
@@ -120,11 +115,13 @@ func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, group
 		}
 
 		if !check {
-			log.Fatal("No 'count' attribute in the sum variables")
+			return nil, false, nil, "", nil, errors.New("no 'count' attribute in the sum variables")
 		}
 	}
 
-	checkRegex(where, whereRegex, "Error parsing the where parameter(s)")
+	if !checkRegex(where, whereRegex) {
+		return nil, false, nil, "", nil, errors.New("error parsing the where parameter(s)")
+	}
 	where = strings.Replace(where, " ", "", -1)
 	where = strings.Replace(where, "{", "", -1)
 	where = strings.Replace(where, "}", "", -1)
@@ -140,20 +137,22 @@ func parseQuery(el *onet.Roster, sum string, count bool, where, predicate, group
 		} else { // if it is a value
 			value, err := strconv.Atoi(tmp[i])
 			if err != nil {
-				log.Fatal("Something wrong with the where value")
+				return nil, false, nil, "", nil, err
 			}
 
 			whereFinal = append(whereFinal, libunlynx.WhereQueryAttribute{Name: variable, Value: *libunlynx.EncryptInt(el.Aggregate, int64(value))})
 		}
 	}
 
-	checkRegex(groupBy, groupByRegex, "Error parsing the groupBy parameter(s)")
+	if !checkRegex(groupBy, groupByRegex) {
+		return nil, false, nil, "", nil, errors.New("error parsing the groupBy parameter(s)")
+	}
 	groupBy = strings.Replace(groupBy, " ", "", -1)
 	groupBy = strings.Replace(groupBy, "{", "", -1)
 	groupBy = strings.Replace(groupBy, "}", "", -1)
 	groupByFinal := strings.Split(groupBy, ",")
 
-	return sumFinal, count, whereFinal, predicate, groupByFinal
+	return sumFinal, count, whereFinal, predicate, groupByFinal, nil
 }
 
 // CLIENT END: QUERIER ----------

app/server.go

@@ -7,7 +7,6 @@ import (
 	// Empty imports to have the init-functions called which should
 	// register the protocol
 	_ "github.com/lca1/unlynx/protocols"
-	_ "github.com/lca1/unlynx/services/default"
 )
 
 func runServer(ctx *cli.Context) error {