Skip to content

Commit 5ca296c

Browse files
ineitiineiti
authored
Merge pull request #181 from c4dt/comments_dedis
@pierluca's and @jbsv's comments
2 parents 31da190 + 4bf8710 commit 5ca296c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+365
-1421
lines changed

‎.github/workflows/build-docker.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ jobs:
4848
REACT_APP_BUILD
4949
REACT_APP_BUILD_TIME
5050
push: ${{ env.push }}
51-
tags: ghcr.io/c4dt/d-voting-frontend:${{ env.DockerTag }}
51+
tags: ghcr.io/dedis/d-voting-frontend:${{ env.DockerTag }}
5252
- name: Build Backend
5353
uses: docker/build-push-action@v2
5454
with:
5555
context: .
5656
file: Dockerfiles/Dockerfile.backend
5757
platforms: linux/amd64
5858
push: ${{ env.push }}
59-
tags: ghcr.io/c4dt/d-voting-backend:${{ env.DockerTag }}
59+
tags: ghcr.io/dedis/d-voting-backend:${{ env.DockerTag }}
6060
- name: Build D-Voting
6161
uses: docker/build-push-action@v2
6262
with:
6363
context: .
6464
file: Dockerfiles/Dockerfile.dela
6565
platforms: linux/amd64
6666
push: ${{ env.push }}
67-
tags: ghcr.io/c4dt/d-voting-dela:${{ env.DockerTag }}
67+
tags: ghcr.io/dedis/d-voting-dela:${{ env.DockerTag }}

‎.github/workflows/go_dvoting_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Install crypto util from Dela
2121
run: |
22-
git clone https://github.com/c4dt/dela.git
22+
git clone https://github.com/dedis/dela.git
2323
cd dela
2424
go install ./cli/crypto
2525

‎.github/workflows/go_scenario_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
- name: Install crypto util from Dela
2020
run: |
21-
git clone https://github.com/c4dt/dela.git
21+
git clone https://github.com/dedis/dela.git
2222
cd dela
2323
go install ./cli/crypto
2424

‎.github/workflows/go_test.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ jobs:
1919
- name: Check out code into the Go module directory
2020
uses: actions/checkout@v3
2121

22-
- name: Run lint
23-
run: make lint
24-
22+
# TODO: https://github.com/dedis/d-voting/issues/392
23+
# - name: Run lint
24+
# run: make lint
25+
#
2526
- name: Run vet
2627
run: make vet
2728

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version=$(shell git describe --abbrev=0 --tags || echo '0.0.0')
2-
versionFlag="github.com/c4dt/d-voting.Version=$(version)"
2+
versionFlag="github.com/dedis/d-voting.Version=$(version)"
33
versionFile=$(shell echo $(version) | tr . _)
4-
timeFlag="github.com/c4dt/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"
4+
timeFlag="github.com/dedis/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"
55

66
lint:
77
# Coding style static check.

‎README.md

+26-26
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,51 @@
1212
<a href="https://sonarcloud.io/summary/new_code?id=dedis_d-voting">
1313
<img src="https://sonarcloud.io/api/project_badges/measure?project=dedis_d-voting&metric=alert_status">
1414
</a>
15-
<a href="https://github.com/c4dt/d-voting/actions/workflows/go_release.yml">
16-
<img src="https://github.com/c4dt/d-voting/actions/workflows/go_release.yml/badge.svg">
15+
<a href="https://github.com/dedis/d-voting/actions/workflows/go_release.yml">
16+
<img src="https://github.com/dedis/d-voting/actions/workflows/go_release.yml/badge.svg">
1717
</a><br/>
18-
<a href="https://github.com/c4dt/d-voting/graphs/contributors">
18+
<a href="https://github.com/dedis/d-voting/graphs/contributors">
1919
<img alt="GitHub contributors" src="https://img.shields.io/github/contributors/dedis/d-voting">
2020
</a>
21-
<a href="https://github.com/c4dt/d-voting/releases">
21+
<a href="https://github.com/dedis/d-voting/releases">
2222
<img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/dedis/d-voting">
2323
</a>
2424
</td>
2525
</tr>
2626
<tr>
2727
<td>Blockchain</td>
2828
<td>
29-
<a href="https://github.com/c4dt/d-voting/actions/workflows/go_test.yml">
30-
<img src="https://github.com/c4dt/d-voting/actions/workflows/go_test.yml/badge.svg">
29+
<a href="https://github.com/dedis/d-voting/actions/workflows/go_test.yml">
30+
<img src="https://github.com/dedis/d-voting/actions/workflows/go_test.yml/badge.svg">
3131
</a>
32-
<a href="https://github.com/c4dt/d-voting/actions/workflows/go_dvoting_test.yml">
33-
<img src="https://github.com/c4dt/d-voting/actions/workflows/go_dvoting_test.yml/badge.svg">
32+
<a href="https://github.com/dedis/d-voting/actions/workflows/go_dvoting_test.yml">
33+
<img src="https://github.com/dedis/d-voting/actions/workflows/go_dvoting_test.yml/badge.svg">
3434
</a>
35-
<a href="https://github.com/c4dt/d-voting/actions/workflows/go_scenario_test.yml">
36-
<img src="https://github.com/c4dt/d-voting/actions/workflows/go_scenario_test.yml/badge.svg">
35+
<a href="https://github.com/dedis/d-voting/actions/workflows/go_scenario_test.yml">
36+
<img src="https://github.com/dedis/d-voting/actions/workflows/go_scenario_test.yml/badge.svg">
3737
</a>
38-
<a href="https://github.com/c4dt/d-voting/actions/workflows/go_integration_tests.yml">
39-
<img src="https://github.com/c4dt/d-voting/actions/workflows/go_integration_tests.yml/badge.svg">
38+
<a href="https://github.com/dedis/d-voting/actions/workflows/go_integration_tests.yml">
39+
<img src="https://github.com/dedis/d-voting/actions/workflows/go_integration_tests.yml/badge.svg">
4040
</a><br/>
4141
<a href="https://coveralls.io/github/dedis/d-voting?branch=main">
4242
<img src="https://coveralls.io/repos/github/dedis/d-voting/badge.svg?branch=main">
4343
</a>
44-
<a href="https://goreportcard.com/report/github.com/c4dt/d-voting">
45-
<img src="https://goreportcard.com/badge/github.com/c4dt/d-voting">
44+
<a href="https://goreportcard.com/report/github.com/dedis/d-voting">
45+
<img src="https://goreportcard.com/badge/github.com/dedis/d-voting">
4646
</a>
47-
<a href="https://pkg.go.dev/github.com/c4dt/d-voting">
48-
<img src="https://pkg.go.dev/badge/github.com/c4dt/d-voting.svg" alt="Go Reference">
47+
<a href="https://pkg.go.dev/github.com/dedis/d-voting">
48+
<img src="https://pkg.go.dev/badge/github.com/dedis/d-voting.svg" alt="Go Reference">
4949
</a>
5050
</td>
5151
<tr>
5252
<tr>
5353
<td>WEB</td>
5454
<td>
55-
<a href="https://github.com/c4dt/d-voting/actions/workflows/web_frontend_lint.yml">
56-
<img src="https://github.com/c4dt/d-voting/actions/workflows/web_frontend_lint.yml/badge.svg">
55+
<a href="https://github.com/dedis/d-voting/actions/workflows/web_frontend_lint.yml">
56+
<img src="https://github.com/dedis/d-voting/actions/workflows/web_frontend_lint.yml/badge.svg">
5757
</a>
58-
<a href="https://github.com/c4dt/d-voting/actions/workflows/web_backend_lint.yml">
59-
<img src="https://github.com/c4dt/d-voting/actions/workflows/web_backend_lint.yml/badge.svg">
58+
<a href="https://github.com/dedis/d-voting/actions/workflows/web_backend_lint.yml">
59+
<img src="https://github.com/dedis/d-voting/actions/workflows/web_backend_lint.yml/badge.svg">
6060
</a>
6161
</td>
6262
</tr>
@@ -67,7 +67,7 @@
6767
# D-Voting
6868

6969
**D-Voting** is an e-voting platform based on the
70-
[Dela](https://github.com/c4dt/dela) blockchain. It uses state-of-the-art
70+
[Dela](https://github.com/dedis/dela) blockchain. It uses state-of-the-art
7171
protocols that guarantee privacy of votes and a fully decentralized process.
7272
This project was born in early 2021 and has been iteratively implemented by EPFL
7373
students under the supervision of DEDIS members.
@@ -147,7 +147,7 @@ sometimes refer to the blockchain node simply as a "node".
147147
The following component diagrams summarizes the interaction between those
148148
high-level components:
149149

150-
[minogrpc]: https://github.com/c4dt/dela/tree/master/mino/minogrpc
150+
[minogrpc]: https://github.com/dedis/dela/tree/master/mino/minogrpc
151151

152152
![Global component diagram](http://www.plantuml.com/plantuml/proxy?src=https://raw.githubusercontent.com/dedis/d-voting/main/docs/assets/component-global.puml)
153153

@@ -390,7 +390,7 @@ results.
390390
2: Install the `crypto` utility from Dela:
391391

392392
```sh
393-
git clone https://github.com/c4dt/dela.git
393+
git clone https://github.com/dedis/dela.git
394394
cd dela/cli/crypto
395395
go install
396396
```
@@ -601,7 +601,7 @@ Afterwards use the following commands, replace 4 by the desired nb of nodes :
601601
./runNode.sh -n 4 -a true -d true
602602
./setupnNode.sh -n 4 -d true
603603
604-
NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1
604+
NNODES=4 KILLNODE=true go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1
605605
```
606606
607607
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
650650
are stored on variables in the root `mod.go`. For example:
651651

652652
```sh
653-
versionFlag="github.com/c4dt/d-voting.Version=`git describe --tags`"
654-
timeFlag="github.com/c4dt/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"
653+
versionFlag="github.com/dedis/d-voting.Version=`git describe --tags`"
654+
timeFlag="github.com/dedis/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"
655655

656656
go build -ldflags="-X $versionFlag -X $timeFlag" ./cli/dvoting
657657
```

‎autotest.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ do
5252
./setupnNode.sh -n $N_NODE -d true
5353
sleep 3
5454
# Start scenario test and keep logs
55-
NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/c4dt/d-voting/integration -count=1 | tee ./log/log/gotest.log
55+
NNODES=$N_NODE go test -v -run ^TestScenario$ github.com/dedis/d-voting/integration -count=1 | tee ./log/log/gotest.log
5656
sleep 3
5757
# Stop the test
5858
./kill_test.sh

‎cli/cosipbftcontroller/action_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/c4dt/d-voting/internal/testing/fake"
10+
"github.com/dedis/d-voting/internal/testing/fake"
1111
"github.com/stretchr/testify/require"
1212
"go.dedis.ch/dela/cli/node"
1313
"go.dedis.ch/dela/core/access"

‎cli/cosipbftcontroller/mod_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"path/filepath"
77
"testing"
88

9-
"github.com/c4dt/d-voting/services/dkg"
9+
"github.com/dedis/d-voting/services/dkg"
1010
"go.dedis.ch/dela/core/ordering"
1111

12-
"github.com/c4dt/d-voting/internal/testing/fake"
12+
"github.com/dedis/d-voting/internal/testing/fake"
1313
"github.com/stretchr/testify/require"
1414
"go.dedis.ch/dela/cli"
1515
"go.dedis.ch/dela/cli/node"

‎cli/dvoting/mod.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ import (
3030
"io"
3131
"os"
3232

33-
dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller"
34-
"github.com/c4dt/d-voting/services/dkg/pedersen/json"
35-
shuffle "github.com/c4dt/d-voting/services/shuffle/neff/controller"
33+
dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller"
34+
"github.com/dedis/d-voting/services/dkg/pedersen/json"
35+
shuffle "github.com/dedis/d-voting/services/shuffle/neff/controller"
3636

37-
cosipbft "github.com/c4dt/d-voting/cli/cosipbftcontroller"
38-
"github.com/c4dt/d-voting/cli/postinstall"
39-
evoting "github.com/c4dt/d-voting/contracts/evoting/controller"
40-
metrics "github.com/c4dt/d-voting/metrics/controller"
37+
cosipbft "github.com/dedis/d-voting/cli/cosipbftcontroller"
38+
"github.com/dedis/d-voting/cli/postinstall"
39+
evoting "github.com/dedis/d-voting/contracts/evoting/controller"
40+
metrics "github.com/dedis/d-voting/metrics/controller"
4141
"go.dedis.ch/dela/cli/node"
4242
access "go.dedis.ch/dela/contracts/access/controller"
4343
db "go.dedis.ch/dela/core/store/kv/controller"
@@ -46,7 +46,7 @@ import (
4646
mino "go.dedis.ch/dela/mino/minogrpc/controller"
4747
proxy "go.dedis.ch/dela/mino/proxy/http/controller"
4848

49-
_ "github.com/c4dt/d-voting/services/shuffle/neff/json"
49+
_ "github.com/dedis/d-voting/services/shuffle/neff/json"
5050

5151
gapi "go.dedis.ch/dela-apps/gapi/controller"
5252
)

‎cli/postinstall/mod.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"path/filepath"
66
"time"
77

8-
evoting "github.com/c4dt/d-voting/contracts/evoting/controller"
9-
prom "github.com/c4dt/d-voting/metrics/controller"
10-
dkg "github.com/c4dt/d-voting/services/dkg/pedersen/controller"
11-
neff "github.com/c4dt/d-voting/services/shuffle/neff/controller"
8+
evoting "github.com/dedis/d-voting/contracts/evoting/controller"
9+
prom "github.com/dedis/d-voting/metrics/controller"
10+
dkg "github.com/dedis/d-voting/services/dkg/pedersen/controller"
11+
neff "github.com/dedis/d-voting/services/shuffle/neff/controller"
1212
"go.dedis.ch/dela"
1313
"go.dedis.ch/dela/cli"
1414
"go.dedis.ch/dela/cli/node"

‎contracts/evoting/controller/action.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import (
1717
"go.dedis.ch/kyber/v3/sign/schnorr"
1818
"go.dedis.ch/kyber/v3/suites"
1919

20-
"github.com/c4dt/d-voting/contracts/evoting/types"
21-
"github.com/c4dt/d-voting/internal/testing/fake"
22-
eproxy "github.com/c4dt/d-voting/proxy"
23-
"github.com/c4dt/d-voting/proxy/txnmanager"
24-
ptypes "github.com/c4dt/d-voting/proxy/types"
25-
"github.com/c4dt/d-voting/services/dkg"
26-
"github.com/c4dt/d-voting/services/shuffle"
20+
"github.com/dedis/d-voting/contracts/evoting/types"
21+
"github.com/dedis/d-voting/internal/testing/fake"
22+
eproxy "github.com/dedis/d-voting/proxy"
23+
"github.com/dedis/d-voting/proxy/txnmanager"
24+
ptypes "github.com/dedis/d-voting/proxy/types"
25+
"github.com/dedis/d-voting/services/dkg"
26+
"github.com/dedis/d-voting/services/shuffle"
2727
"github.com/gorilla/mux"
2828
"go.dedis.ch/dela"
2929
"go.dedis.ch/dela/cli/node"

‎contracts/evoting/evoting.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/evoting/json/ciphervote.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/c4dt/d-voting/contracts/evoting/types"
4+
"github.com/dedis/d-voting/contracts/evoting/types"
55
"go.dedis.ch/dela/serde"
66
"golang.org/x/xerrors"
77
)

‎contracts/evoting/json/forms.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/hex"
55
"encoding/json"
66

7-
"github.com/c4dt/d-voting/contracts/evoting/types"
7+
"github.com/dedis/d-voting/contracts/evoting/types"
88
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
99
ctypes "go.dedis.ch/dela/core/ordering/cosipbft/types"
1010
"go.dedis.ch/dela/serde"
@@ -36,8 +36,8 @@ func (formFormat) Encode(ctx serde.Context, message serde.Message) ([]byte, erro
3636
}
3737
}
3838

39-
suffragias := make([]string, len(m.SuffragiaIDs))
40-
for i, suf := range m.SuffragiaIDs {
39+
suffragias := make([]string, len(m.SuffragiaStoreKeys))
40+
for i, suf := range m.SuffragiaStoreKeys {
4141
suffragias[i] = hex.EncodeToString(suf)
4242
}
4343

@@ -146,19 +146,19 @@ func (formFormat) Decode(ctx serde.Context, data []byte) (serde.Message, error)
146146
}
147147

148148
return types.Form{
149-
Configuration: formJSON.Configuration,
150-
FormID: formJSON.FormID,
151-
Status: types.Status(formJSON.Status),
152-
Pubkey: pubKey,
153-
BallotSize: formJSON.BallotSize,
154-
SuffragiaIDs: suffragias,
155-
SuffragiaHashes: suffragiaHashes,
156-
BallotCount: formJSON.BallotCount,
157-
ShuffleInstances: shuffleInstances,
158-
ShuffleThreshold: formJSON.ShuffleThreshold,
159-
PubsharesUnits: pubSharesSubmissions,
160-
DecryptedBallots: formJSON.DecryptedBallots,
161-
Roster: roster,
149+
Configuration: formJSON.Configuration,
150+
FormID: formJSON.FormID,
151+
Status: types.Status(formJSON.Status),
152+
Pubkey: pubKey,
153+
BallotSize: formJSON.BallotSize,
154+
SuffragiaStoreKeys: suffragias,
155+
SuffragiaHashes: suffragiaHashes,
156+
BallotCount: formJSON.BallotCount,
157+
ShuffleInstances: shuffleInstances,
158+
ShuffleThreshold: formJSON.ShuffleThreshold,
159+
PubsharesUnits: pubSharesSubmissions,
160+
DecryptedBallots: formJSON.DecryptedBallots,
161+
Roster: roster,
162162
}, nil
163163
}
164164

‎contracts/evoting/json/mod.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"github.com/c4dt/d-voting/contracts/evoting/types"
4+
"github.com/dedis/d-voting/contracts/evoting/types"
55
"go.dedis.ch/dela/serde"
66
)
77

‎contracts/evoting/json/suffragia.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package json
33
import (
44
"encoding/json"
55

6-
"github.com/c4dt/d-voting/contracts/evoting/types"
6+
"github.com/dedis/d-voting/contracts/evoting/types"
77
"go.dedis.ch/dela/serde"
88
"golang.org/x/xerrors"
99
)

‎contracts/evoting/json/transaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package json
33
import (
44
"encoding/json"
55

6-
"github.com/c4dt/d-voting/contracts/evoting/types"
6+
"github.com/dedis/d-voting/contracts/evoting/types"
77
"go.dedis.ch/dela/serde"
88
"golang.org/x/xerrors"
99
)

0 commit comments

Comments
 (0)