Merge pull request #181 from c4dt/comments_dedis

@pierluca's and @jbsv's comments

.github/workflows/build-docker.yml

@@ -48,20 +48,20 @@ jobs:
             REACT_APP_BUILD
             REACT_APP_BUILD_TIME
           push: ${{ env.push }}
-          tags: ghcr.io/c4dt/d-voting-frontend:${{ env.DockerTag }}
+          tags: ghcr.io/dedis/d-voting-frontend:${{ env.DockerTag }}
       - name: Build Backend
         uses: docker/build-push-action@v2
         with:
           context: .
           file: Dockerfiles/Dockerfile.backend
           platforms: linux/amd64
           push: ${{ env.push }}
-          tags: ghcr.io/c4dt/d-voting-backend:${{ env.DockerTag }}
+          tags: ghcr.io/dedis/d-voting-backend:${{ env.DockerTag }}
       - name: Build D-Voting
         uses: docker/build-push-action@v2
         with:
           context: .
           file: Dockerfiles/Dockerfile.dela
           platforms: linux/amd64
           push: ${{ env.push }}
-          tags: ghcr.io/c4dt/d-voting-dela:${{ env.DockerTag }}
+          tags: ghcr.io/dedis/d-voting-dela:${{ env.DockerTag }}

.github/workflows/go_dvoting_test.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Install crypto util from Dela
         run: |
-          git clone https://github.com/c4dt/dela.git
+          git clone https://github.com/dedis/dela.git
           cd dela
           go install ./cli/crypto
 

.github/workflows/go_scenario_test.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Install crypto util from Dela
         run: |
-          git clone https://github.com/c4dt/dela.git
+          git clone https://github.com/dedis/dela.git
           cd dela
           go install ./cli/crypto
 

.github/workflows/go_test.yml

@@ -19,9 +19,10 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
 
-      - name: Run lint
-        run: make lint
-
+# TODO: https://github.com/dedis/d-voting/issues/392
+#      - name: Run lint
+#        run: make lint
+#
       - name: Run vet
         run: make vet
 

Makefile

@@ -1,7 +1,7 @@
 version=$(shell git describe --abbrev=0 --tags || echo '0.0.0')
-versionFlag="github.com/c4dt/d-voting.Version=$(version)"
+versionFlag="github.com/dedis/d-voting.Version=$(version)"
 versionFile=$(shell echo $(version) | tr . _)
-timeFlag="github.com/c4dt/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"
+timeFlag="github.com/dedis/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"
 
 lint:
 	# Coding style static check.

README.md

@@ -12,51 +12,51 @@
         <a href="https://sonarcloud.io/summary/new_code?id=dedis_d-voting">
             <img src="https://sonarcloud.io/api/project_badges/measure?project=dedis_d-voting&metric=alert_status">
         </a>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/go_release.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/go_release.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/go_release.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/go_release.yml/badge.svg">
         </a><br/>
-        <a href="https://github.com/c4dt/d-voting/graphs/contributors">
+        <a href="https://github.com/dedis/d-voting/graphs/contributors">
             <img alt="GitHub contributors" src="https://img.shields.io/github/contributors/dedis/d-voting">
         </a>
-        <a href="https://github.com/c4dt/d-voting/releases">
+        <a href="https://github.com/dedis/d-voting/releases">
             <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/dedis/d-voting">
         </a>
       </td>
 </tr>
 <tr>
     <td>Blockchain</td>
     <td>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/go_test.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/go_test.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/go_test.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/go_test.yml/badge.svg">
         </a>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/go_dvoting_test.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/go_dvoting_test.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/go_dvoting_test.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/go_dvoting_test.yml/badge.svg">
         </a>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/go_scenario_test.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/go_scenario_test.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/go_scenario_test.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/go_scenario_test.yml/badge.svg">
         </a>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/go_integration_tests.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/go_integration_tests.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/go_integration_tests.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/go_integration_tests.yml/badge.svg">
         </a><br/>
         <a href="https://coveralls.io/github/dedis/d-voting?branch=main">
             <img src="https://coveralls.io/repos/github/dedis/d-voting/badge.svg?branch=main">
         </a>
-        <a href="https://goreportcard.com/report/github.com/c4dt/d-voting">
-            <img src="https://goreportcard.com/badge/github.com/c4dt/d-voting">
+        <a href="https://goreportcard.com/report/github.com/dedis/d-voting">
+            <img src="https://goreportcard.com/badge/github.com/dedis/d-voting">
         </a>
-        <a href="https://pkg.go.dev/github.com/c4dt/d-voting">
-            <img src="https://pkg.go.dev/badge/github.com/c4dt/d-voting.svg" alt="Go Reference">
+        <a href="https://pkg.go.dev/github.com/dedis/d-voting">
+            <img src="https://pkg.go.dev/badge/github.com/dedis/d-voting.svg" alt="Go Reference">
         </a>
     </td>
 <tr>
 <tr>
     <td>WEB</td>
     <td>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/web_frontend_lint.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/web_frontend_lint.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/web_frontend_lint.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/web_frontend_lint.yml/badge.svg">
         </a>
-        <a href="https://github.com/c4dt/d-voting/actions/workflows/web_backend_lint.yml">
-            <img src="https://github.com/c4dt/d-voting/actions/workflows/web_backend_lint.yml/badge.svg">
+        <a href="https://github.com/dedis/d-voting/actions/workflows/web_backend_lint.yml">
+            <img src="https://github.com/dedis/d-voting/actions/workflows/web_backend_lint.yml/badge.svg">
         </a>
     </td>
 </tr>
@@ -67,7 +67,7 @@
 # D-Voting
 
 **D-Voting** is an e-voting platform based on the
-[Dela](https://github.com/c4dt/dela) blockchain. It uses state-of-the-art
+[Dela](https://github.com/dedis/dela) blockchain. It uses state-of-the-art
 protocols that guarantee privacy of votes and a fully decentralized process.
 This project was born in early 2021 and has been iteratively implemented by EPFL
 students under the supervision of DEDIS members.
@@ -147,7 +147,7 @@ sometimes refer to the blockchain node simply as a "node".
 The following component diagrams summarizes the interaction between those
 high-level components:
 
-[minogrpc]: https://github.com/c4dt/dela/tree/master/mino/minogrpc
+[minogrpc]: https://github.com/dedis/dela/tree/master/mino/minogrpc
 
 ![Global component diagram](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/dedis/d-voting/main/docs/assets/component-global.puml)
 
@@ -390,7 +390,7 @@ results.
 2: Install the `crypto` utility from Dela:
 
 ```sh
-git clone https://github.com/c4dt/dela.git
+git clone https://github.com/dedis/dela.git
 cd dela/cli/crypto
 go install
 ```
@@ -601,7 +601,7 @@ Afterwards use the following commands, replace 4 by the desired nb of nodes :
 ./runNode.sh -n 4 -a true -d true
 ./setupnNode.sh -n 4 -d true
 
-NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1
+NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1
 ```
 
 Here we set KILLNODE=true or false to decide whether kill and restart a node
@@ -650,8 +650,8 @@ Build info can be added to the binary with the `ldflags`, at build time. Infos
 are stored on variables in the root `mod.go`. For example:
 
 ```sh
-versionFlag="github.com/c4dt/d-voting.Version=`git describe --tags`"
-timeFlag="github.com/c4dt/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"
+versionFlag="github.com/dedis/d-voting.Version=`git describe --tags`"
+timeFlag="github.com/dedis/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"
 
 go build -ldflags="-X $versionFlag -X $timeFlag" ./cli/dvoting
 ```

autotest.sh

@@ -52,7 +52,7 @@ do
     ./setupnNode.sh -n $N_NODE -d true
     sleep 3
     # Start scenario test and keep logs 
-    NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1 | tee ./log/log/gotest.log
+    NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1 | tee ./log/log/gotest.log
     sleep 3
     # Stop the test
     ./kill_test.sh

cli/cosipbftcontroller/action_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/c4dt/d-voting/internal/testing/fake"
+	"github.com/dedis/d-voting/internal/testing/fake"
 	"github.com/stretchr/testify/require"
 	"go.dedis.ch/dela/cli/node"
 	"go.dedis.ch/dela/core/access"

cli/cosipbftcontroller/mod_test.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/c4dt/d-voting/services/dkg"
+	"github.com/dedis/d-voting/services/dkg"
 	"go.dedis.ch/dela/core/ordering"
 
-	"github.com/c4dt/d-voting/internal/testing/fake"
+	"github.com/dedis/d-voting/internal/testing/fake"
 	"github.com/stretchr/testify/require"
 	"go.dedis.ch/dela/cli"
 	"go.dedis.ch/dela/cli/node"

cli/dvoting/mod.go

@@ -30,14 +30,14 @@ import (
 	"io"
 	"os"
 
-	dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller"
-	"github.com/c4dt/d-voting/services/dkg/pedersen/json"
-	shuffle "github.com/c4dt/d-voting/services/shuffle/neff/controller"
+	dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller"
+	"github.com/dedis/d-voting/services/dkg/pedersen/json"
+	shuffle "github.com/dedis/d-voting/services/shuffle/neff/controller"
 
-	cosipbft "github.com/c4dt/d-voting/cli/cosipbftcontroller"
-	"github.com/c4dt/d-voting/cli/postinstall"
-	evoting "github.com/c4dt/d-voting/contracts/evoting/controller"
-	metrics "github.com/c4dt/d-voting/metrics/controller"
+	cosipbft "github.com/dedis/d-voting/cli/cosipbftcontroller"
+	"github.com/dedis/d-voting/cli/postinstall"
+	evoting "github.com/dedis/d-voting/contracts/evoting/controller"
+	metrics "github.com/dedis/d-voting/metrics/controller"
 	"go.dedis.ch/dela/cli/node"
 	access "go.dedis.ch/dela/contracts/access/controller"
 	db "go.dedis.ch/dela/core/store/kv/controller"
@@ -46,7 +46,7 @@ import (
 	mino "go.dedis.ch/dela/mino/minogrpc/controller"
 	proxy "go.dedis.ch/dela/mino/proxy/http/controller"
 
-	_ "github.com/c4dt/d-voting/services/shuffle/neff/json"
+	_ "github.com/dedis/d-voting/services/shuffle/neff/json"
 
 	gapi "go.dedis.ch/dela-apps/gapi/controller"
 )

cli/postinstall/mod.go

@@ -5,10 +5,10 @@ import (
 	"path/filepath"
 	"time"
 
-	evoting "github.com/c4dt/d-voting/contracts/evoting/controller"
-	prom "github.com/c4dt/d-voting/metrics/controller"
-	dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller"
-	neff "github.com/c4dt/d-voting/services/shuffle/neff/controller"
+	evoting "github.com/dedis/d-voting/contracts/evoting/controller"
+	prom "github.com/dedis/d-voting/metrics/controller"
+	dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller"
+	neff "github.com/dedis/d-voting/services/shuffle/neff/controller"
 	"go.dedis.ch/dela"
 	"go.dedis.ch/dela/cli"
 	"go.dedis.ch/dela/cli/node"

contracts/evoting/controller/action.go

@@ -17,13 +17,13 @@ import (
 	"go.dedis.ch/kyber/v3/sign/schnorr"
 	"go.dedis.ch/kyber/v3/suites"
 
-	"github.com/c4dt/d-voting/contracts/evoting/types"
-	"github.com/c4dt/d-voting/internal/testing/fake"
-	eproxy "github.com/c4dt/d-voting/proxy"
-	"github.com/c4dt/d-voting/proxy/txnmanager"
-	ptypes "github.com/c4dt/d-voting/proxy/types"
-	"github.com/c4dt/d-voting/services/dkg"
-	"github.com/c4dt/d-voting/services/shuffle"
+	"github.com/dedis/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/internal/testing/fake"
+	eproxy "github.com/dedis/d-voting/proxy"
+	"github.com/dedis/d-voting/proxy/txnmanager"
+	ptypes "github.com/dedis/d-voting/proxy/types"
+	"github.com/dedis/d-voting/services/dkg"
+	"github.com/dedis/d-voting/services/shuffle"
 	"github.com/gorilla/mux"
 	"go.dedis.ch/dela"
 	"go.dedis.ch/dela/cli/node"

contracts/evoting/json/ciphervote.go

@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/c4dt/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/contracts/evoting/types"
 	"go.dedis.ch/dela/serde"
 	"golang.org/x/xerrors"
 )

contracts/evoting/json/forms.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 
-	"github.com/c4dt/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/contracts/evoting/types"
 	"go.dedis.ch/dela/core/ordering/cosipbft/authority"
 	ctypes "go.dedis.ch/dela/core/ordering/cosipbft/types"
 	"go.dedis.ch/dela/serde"
@@ -36,8 +36,8 @@ func (formFormat) Encode(ctx serde.Context, message serde.Message) ([]byte, erro
 			}
 		}
 
-		suffragias := make([]string, len(m.SuffragiaIDs))
-		for i, suf := range m.SuffragiaIDs {
+		suffragias := make([]string, len(m.SuffragiaStoreKeys))
+		for i, suf := range m.SuffragiaStoreKeys {
 			suffragias[i] = hex.EncodeToString(suf)
 		}
 
@@ -146,19 +146,19 @@ func (formFormat) Decode(ctx serde.Context, data []byte) (serde.Message, error)
 	}
 
 	return types.Form{
-		Configuration:    formJSON.Configuration,
-		FormID:           formJSON.FormID,
-		Status:           types.Status(formJSON.Status),
-		Pubkey:           pubKey,
-		BallotSize:       formJSON.BallotSize,
-		SuffragiaIDs:     suffragias,
-		SuffragiaHashes:  suffragiaHashes,
-		BallotCount:      formJSON.BallotCount,
-		ShuffleInstances: shuffleInstances,
-		ShuffleThreshold: formJSON.ShuffleThreshold,
-		PubsharesUnits:   pubSharesSubmissions,
-		DecryptedBallots: formJSON.DecryptedBallots,
-		Roster:           roster,
+		Configuration:      formJSON.Configuration,
+		FormID:             formJSON.FormID,
+		Status:             types.Status(formJSON.Status),
+		Pubkey:             pubKey,
+		BallotSize:         formJSON.BallotSize,
+		SuffragiaStoreKeys: suffragias,
+		SuffragiaHashes:    suffragiaHashes,
+		BallotCount:        formJSON.BallotCount,
+		ShuffleInstances:   shuffleInstances,
+		ShuffleThreshold:   formJSON.ShuffleThreshold,
+		PubsharesUnits:     pubSharesSubmissions,
+		DecryptedBallots:   formJSON.DecryptedBallots,
+		Roster:             roster,
 	}, nil
 }
 

contracts/evoting/json/mod.go

@@ -1,7 +1,7 @@
 package json
 
 import (
-	"github.com/c4dt/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/contracts/evoting/types"
 	"go.dedis.ch/dela/serde"
 )
 

contracts/evoting/json/suffragia.go

@@ -3,7 +3,7 @@ package json
 import (
 	"encoding/json"
 
-	"github.com/c4dt/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/contracts/evoting/types"
 	"go.dedis.ch/dela/serde"
 	"golang.org/x/xerrors"
 )

contracts/evoting/json/transaction.go

@@ -3,7 +3,7 @@ package json
 import (
 	"encoding/json"
 
-	"github.com/c4dt/d-voting/contracts/evoting/types"
+	"github.com/dedis/d-voting/contracts/evoting/types"
 	"go.dedis.ch/dela/serde"
 	"golang.org/x/xerrors"
 )