Skip to content

Commit 9d35c68

Browse files
jbsvjbsv
committed
revert go.dedis.ch to github.com/dedis
1 parent 0806556 commit 9d35c68

Some content is hidden

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

61 files changed

+180
-183
lines changed

‎Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version=$(shell git describe --abbrev=0 --tags || echo '0.0.0')
2-
versionFlag="go.dedis.ch/d-voting.Version=$(version)"
2+
versionFlag="github.com/dedis/d-voting.Version=$(version)"
33
versionFile=$(shell echo $(version) | tr . _)
4-
timeFlag="go.dedis.ch/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.
8-
@go install honnef.co/go/tools/cmd/staticcheck@v0.6.1
8+
@go install honnef.co/go/tools/cmd/staticcheck@latest
99
@go mod tidy
1010
staticcheck ./...
1111
# golint -set_exit_status ./...
@@ -21,7 +21,7 @@ check: lint vet
2121
go test `go list ./... | grep -v /integration`
2222

2323
test_integration:
24-
go test ./integration
24+
go test ./integration -timeout 50s
2525

2626
build:
2727
go build -ldflags="-X $(versionFlag) -X $(timeFlag)" -o dvoting ./cli/dvoting
@@ -30,4 +30,4 @@ build:
3030
GOOS=windows GOARCH=amd64 go build -ldflags="-X $(versionFlag) -X $(timeFlag)" -o dvoting-windows-amd64-$(versionFile) ./cli/dvoting
3131

3232
deb: build
33-
cd deb-package; ./build-deb.sh; cd ..
33+
cd deb-package; ./build-deb.sh; cd ..

‎cli/cosipbftcontroller/action_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"testing"
88
"time"
99

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

‎cli/cosipbftcontroller/mod_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"path/filepath"
77
"testing"
88

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

12+
"github.com/dedis/d-voting/internal/testing/fake"
1213
"github.com/stretchr/testify/require"
13-
"go.dedis.ch/d-voting/internal/testing/fake"
1414
"go.dedis.ch/dela/cli"
1515
"go.dedis.ch/dela/cli/node"
1616
"go.dedis.ch/dela/core/store/kv"

‎cli/dvoting/mod.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ import (
3030
"io"
3131
"os"
3232

33-
dkg "go.dedis.ch/d-voting/services/dkg/pedersen/controller"
34-
"go.dedis.ch/d-voting/services/dkg/pedersen/json"
35-
shuffle "go.dedis.ch/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 "go.dedis.ch/d-voting/cli/cosipbftcontroller"
38-
"go.dedis.ch/d-voting/cli/postinstall"
39-
evoting "go.dedis.ch/d-voting/contracts/evoting/controller"
40-
metrics "go.dedis.ch/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-
_ "go.dedis.ch/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‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"path/filepath"
66
"time"
77

8-
evoting "go.dedis.ch/d-voting/contracts/evoting/controller"
9-
prom "go.dedis.ch/d-voting/metrics/controller"
10-
dkg "go.dedis.ch/d-voting/services/dkg/pedersen/controller"
11-
neff "go.dedis.ch/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‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ import (
1717
"go.dedis.ch/kyber/v3/sign/schnorr"
1818
"go.dedis.ch/kyber/v3/suites"
1919

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"
2027
"github.com/gorilla/mux"
21-
"go.dedis.ch/d-voting/contracts/evoting/types"
22-
"go.dedis.ch/d-voting/internal/testing/fake"
23-
eproxy "go.dedis.ch/d-voting/proxy"
24-
"go.dedis.ch/d-voting/proxy/txnmanager"
25-
ptypes "go.dedis.ch/d-voting/proxy/types"
26-
"go.dedis.ch/d-voting/services/dkg"
27-
"go.dedis.ch/d-voting/services/shuffle"
2828
"go.dedis.ch/dela"
2929
"go.dedis.ch/dela/cli/node"
3030
"go.dedis.ch/dela/core/ordering"

‎contracts/evoting/evoting.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎contracts/evoting/json/ciphervote.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

33
import (
4-
"go.dedis.ch/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‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"encoding/hex"
55
"encoding/json"
66

7-
"go.dedis.ch/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.SuffragiaStoreKeys))
40-
for i, suf := range m.SuffragiaStoreKeys {
39+
suffragias := make([]string, len(m.SuffragiaIDs))
40+
for i, suf := range m.SuffragiaIDs {
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-
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,
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,
162162
}, nil
163163
}
164164

‎contracts/evoting/json/mod.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package json
22

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

0 commit comments

Comments
 (0)