Skip to content

Commit

Permalink
change github.com to go.dedis.ch
Browse files Browse the repository at this point in the history
  • Loading branch information
jbsv committed Dec 16, 2024
1 parent 37ad9b7 commit 74c9286
Show file tree
Hide file tree
Showing 60 changed files with 148 additions and 148 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version=$(shell git describe --abbrev=0 --tags || echo '0.0.0')
versionFlag="github.com/dedis/d-voting.Version=$(version)"
versionFlag="go.dedis.ch/d-voting.Version=$(version)"
versionFile=$(shell echo $(version) | tr . _)
timeFlag="github.com/dedis/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"
timeFlag="go.dedis.ch/d-voting.BuildTime=$(shell date +'%d/%m/%y_%H:%M')"

lint:
# Coding style static check.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/dedis/d-voting.Version=`git describe --tags`"
timeFlag="github.com/dedis/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"
versionFlag="go.dedis.ch/d-voting.Version=`git describe --tags`"
timeFlag="go.dedis.ch/d-voting.BuildTime=`date +'%d/%m/%y_%H:%M'`"

go build -ldflags="-X $versionFlag -X $timeFlag" ./cli/dvoting
```
Expand Down
2 changes: 1 addition & 1 deletion cli/cosipbftcontroller/action_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/internal/testing/fake"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/internal/testing/fake"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/ordering"
Expand Down
4 changes: 2 additions & 2 deletions cli/cosipbftcontroller/mod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"path/filepath"
"testing"

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

"github.com/dedis/d-voting/internal/testing/fake"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/internal/testing/fake"
"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/store/kv"
Expand Down
16 changes: 8 additions & 8 deletions cli/dvoting/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ import (
"io"
"os"

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"
dkg "go.dedis.ch/d-voting/services/dkg/pedersen/controller"
"go.dedis.ch/d-voting/services/dkg/pedersen/json"
shuffle "go.dedis.ch/d-voting/services/shuffle/neff/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"
cosipbft "go.dedis.ch/d-voting/cli/cosipbftcontroller"
"go.dedis.ch/d-voting/cli/postinstall"
evoting "go.dedis.ch/d-voting/contracts/evoting/controller"
metrics "go.dedis.ch/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"
Expand All @@ -46,7 +46,7 @@ import (
mino "go.dedis.ch/dela/mino/minogrpc/controller"
proxy "go.dedis.ch/dela/mino/proxy/http/controller"

_ "github.com/dedis/d-voting/services/shuffle/neff/json"
_ "go.dedis.ch/d-voting/services/shuffle/neff/json"

gapi "go.dedis.ch/dela-apps/gapi/controller"
)
Expand Down
8 changes: 4 additions & 4 deletions cli/postinstall/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"path/filepath"
"time"

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"
evoting "go.dedis.ch/d-voting/contracts/evoting/controller"
prom "go.dedis.ch/d-voting/metrics/controller"
dkg "go.dedis.ch/d-voting/services/dkg/pedersen/controller"
neff "go.dedis.ch/d-voting/services/shuffle/neff/controller"
"go.dedis.ch/dela"
"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
Expand Down
14 changes: 7 additions & 7 deletions contracts/evoting/controller/action.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ import (
"go.dedis.ch/kyber/v3/sign/schnorr"
"go.dedis.ch/kyber/v3/suites"

"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/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/internal/testing/fake"
eproxy "go.dedis.ch/d-voting/proxy"
"go.dedis.ch/d-voting/proxy/txnmanager"
ptypes "go.dedis.ch/d-voting/proxy/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/d-voting/services/shuffle"
"go.dedis.ch/dela"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/ordering"
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/evoting.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/evoting/json/ciphervote.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package json

import (
"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/dela/serde"
"golang.org/x/xerrors"
)
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/forms.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/hex"
"encoding/json"

"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/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"
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/mod.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package json

import (
"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/dela/serde"
)

Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/suffragia.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package json
import (
"encoding/json"

"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/dela/serde"
"golang.org/x/xerrors"
)
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package json
import (
"encoding/json"

"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/dela/serde"
"golang.org/x/xerrors"
)
Expand Down
8 changes: 4 additions & 4 deletions contracts/evoting/mod.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package evoting

import (
dvoting "github.com/dedis/d-voting"
"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/services/dkg"
"github.com/prometheus/client_golang/prometheus"
dvoting "go.dedis.ch/d-voting"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/execution"
"go.dedis.ch/dela/core/execution/native"
Expand All @@ -19,7 +19,7 @@ import (
"golang.org/x/xerrors"

// Register the JSON format for the form
_ "github.com/dedis/d-voting/contracts/evoting/json"
_ "go.dedis.ch/d-voting/contracts/evoting/json"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions contracts/evoting/mod_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strconv"
"testing"

"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/internal/testing/fake"
"github.com/dedis/d-voting/services/dkg"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/internal/testing/fake"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/execution"
"go.dedis.ch/dela/core/execution/native"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dedis/d-voting
module go.dedis.ch/d-voting

go 1.23

Expand Down
14 changes: 7 additions & 7 deletions integration/ballot.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ import (

"sync/atomic"

"github.com/dedis/d-voting/contracts/evoting"
"github.com/dedis/d-voting/contracts/evoting/controller"
"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/internal/testing/fake"
"github.com/dedis/d-voting/proxy/txnmanager"
ptypes "github.com/dedis/d-voting/proxy/types"
"github.com/dedis/d-voting/services/dkg"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting"
"go.dedis.ch/d-voting/contracts/evoting/controller"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/internal/testing/fake"
"go.dedis.ch/d-voting/proxy/txnmanager"
ptypes "go.dedis.ch/d-voting/proxy/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/kyber/v3"
Expand Down
4 changes: 2 additions & 2 deletions integration/dkg.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

ptypes "github.com/dedis/d-voting/proxy/types"
"github.com/dedis/d-voting/services/dkg"
"github.com/stretchr/testify/require"
ptypes "go.dedis.ch/d-voting/proxy/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/kyber/v3"
"golang.org/x/xerrors"
Expand Down
12 changes: 6 additions & 6 deletions integration/dvotingdela.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ import (
"sync"
"time"

"github.com/dedis/d-voting/contracts/evoting"
etypes "github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/services/dkg"
"github.com/dedis/d-voting/services/dkg/pedersen"
"github.com/dedis/d-voting/services/shuffle"
"github.com/dedis/d-voting/services/shuffle/neff"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting"
etypes "go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/d-voting/services/dkg/pedersen"
"go.dedis.ch/d-voting/services/shuffle"
"go.dedis.ch/d-voting/services/shuffle/neff"
accessContract "go.dedis.ch/dela/contracts/access"
"go.dedis.ch/dela/contracts/value"
"go.dedis.ch/dela/core/access"
Expand Down
10 changes: 5 additions & 5 deletions integration/form.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting"
"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/internal/testing/fake"
"github.com/dedis/d-voting/proxy/txnmanager"
ptypes "github.com/dedis/d-voting/proxy/types"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/internal/testing/fake"
"go.dedis.ch/d-voting/proxy/txnmanager"
ptypes "go.dedis.ch/d-voting/proxy/types"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/txn"
Expand Down
6 changes: 3 additions & 3 deletions integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting/types"
_ "github.com/dedis/d-voting/services/dkg/pedersen/json"
_ "github.com/dedis/d-voting/services/shuffle/neff/json"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting/types"
_ "go.dedis.ch/d-voting/services/dkg/pedersen/json"
_ "go.dedis.ch/d-voting/services/shuffle/neff/json"
delaPkg "go.dedis.ch/dela"
)

Expand Down
2 changes: 1 addition & 1 deletion integration/nodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting/types"
"golang.org/x/xerrors"
)

Expand Down
6 changes: 3 additions & 3 deletions integration/performance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting"
"github.com/dedis/d-voting/contracts/evoting/types"
"github.com/dedis/d-voting/services/dkg"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/ordering/cosipbft"
"go.dedis.ch/dela/core/txn"
Expand Down
4 changes: 2 additions & 2 deletions integration/scenario_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting/types"
ptypes "github.com/dedis/d-voting/proxy/types"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting/types"
ptypes "go.dedis.ch/d-voting/proxy/types"
"go.dedis.ch/kyber/v3/util/encoding"
)

Expand Down
2 changes: 1 addition & 1 deletion integration/shuffle.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package integration

import (
"github.com/dedis/d-voting/services/shuffle"
"go.dedis.ch/d-voting/services/shuffle"
"go.dedis.ch/dela/core/txn/signed"
"golang.org/x/xerrors"
)
Expand Down
6 changes: 3 additions & 3 deletions integration/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting"
"github.com/dedis/d-voting/proxy/txnmanager"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting"
"go.dedis.ch/d-voting/proxy/txnmanager"
"go.dedis.ch/dela"
"go.dedis.ch/dela/contracts/access"
"go.dedis.ch/dela/core/execution/native"
Expand Down Expand Up @@ -134,7 +134,7 @@ func (m txManager) addAndWait(args ...txn.Arg) ([]byte, error) {
}

cancel()

time.Sleep(time.Millisecond * (1 << i))
}

Expand Down
6 changes: 3 additions & 3 deletions integration/votes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"testing"
"time"

"github.com/dedis/d-voting/contracts/evoting/types"
_ "github.com/dedis/d-voting/services/dkg/pedersen/json"
_ "github.com/dedis/d-voting/services/shuffle/neff/json"
"github.com/rs/zerolog"
"github.com/stretchr/testify/require"
"go.dedis.ch/d-voting/contracts/evoting/types"
_ "go.dedis.ch/d-voting/services/dkg/pedersen/json"
_ "go.dedis.ch/d-voting/services/shuffle/neff/json"
delaPkg "go.dedis.ch/dela"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/testing/fake/dkg.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package fake

import (
"github.com/dedis/d-voting/services/dkg"
"go.dedis.ch/d-voting/services/dkg"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/kyber/v3"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/testing/fake/election.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package fake
import (
"strconv"

"github.com/dedis/d-voting/contracts/evoting/types"
"go.dedis.ch/d-voting/contracts/evoting/types"
"go.dedis.ch/dela/core/store"
"go.dedis.ch/dela/serde"
"go.dedis.ch/kyber/v3"
Expand Down
Loading

0 comments on commit 74c9286

Please sign in to comment.