Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moving back to go.dedis.ch/dela #58

Closed
wants to merge 1 commit into from
Closed

Moving back to go.dedis.ch/dela #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions cli/cosipbftcontroller/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ import (
"fmt"
"strings"

"github.com/c4dt/dela"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/ordering/cosipbft/contracts/viewchange"
"github.com/c4dt/dela/core/txn"
"github.com/c4dt/dela/core/txn/pool"
"github.com/c4dt/dela/cosi"
"github.com/c4dt/dela/crypto"
"github.com/c4dt/dela/mino"
"go.dedis.ch/dela"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/ordering/cosipbft/contracts/viewchange"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/dela/core/txn/pool"
"go.dedis.ch/dela/cosi"
"go.dedis.ch/dela/crypto"
"go.dedis.ch/dela/mino"
"golang.org/x/xerrors"
)

Expand Down
22 changes: 11 additions & 11 deletions cli/cosipbftcontroller/action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
"time"

"github.com/c4dt/d-voting/internal/testing/fake"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/access"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/txn"
"github.com/c4dt/dela/core/txn/pool"
"github.com/c4dt/dela/core/txn/pool/mem"
"github.com/c4dt/dela/core/validation"
"github.com/c4dt/dela/cosi"
"github.com/c4dt/dela/crypto"
"github.com/c4dt/dela/mino"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/dela/core/txn/pool"
"go.dedis.ch/dela/core/txn/pool/mem"
"go.dedis.ch/dela/core/validation"
"go.dedis.ch/dela/cosi"
"go.dedis.ch/dela/crypto"
"go.dedis.ch/dela/mino"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -94,7 +94,7 @@

var p pool.Pool
require.NoError(t, ctx.Injector.Resolve(&p))
require.Equal(t, 1, p.Len())

Check failure on line 97 in cli/cosipbftcontroller/action_test.go

View workflow job for this annotation

GitHub Actions / Tests 

p.Len undefined (type pool.Pool has no field or method Len) (compile)

ctx.Injector = node.NewInjector()
err = action.Execute(ctx)
Expand Down
48 changes: 24 additions & 24 deletions cli/cosipbftcontroller/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@
"path/filepath"
"time"

"github.com/c4dt/dela/contracts/value"
"github.com/c4dt/dela/crypto"

"github.com/c4dt/dela/cli"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/access/darc"
"github.com/c4dt/dela/core/execution/native"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/ordering/cosipbft"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/ordering/cosipbft/blockstore"
"github.com/c4dt/dela/core/ordering/cosipbft/types"
"github.com/c4dt/dela/core/store/hashtree/binprefix"
"github.com/c4dt/dela/core/store/kv"
"github.com/c4dt/dela/core/txn/pool"
poolimpl "github.com/c4dt/dela/core/txn/pool/gossip"
"github.com/c4dt/dela/core/txn/signed"
"github.com/c4dt/dela/core/validation/simple"
"github.com/c4dt/dela/cosi/threshold"
"github.com/c4dt/dela/crypto/bls"
"github.com/c4dt/dela/crypto/loader"
"github.com/c4dt/dela/mino"
"github.com/c4dt/dela/mino/gossip"
"github.com/c4dt/dela/serde/json"
"go.dedis.ch/dela/contracts/value"
"go.dedis.ch/dela/crypto"

"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/access/darc"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/ordering/cosipbft"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/ordering/cosipbft/blockstore"
"go.dedis.ch/dela/core/ordering/cosipbft/types"
"go.dedis.ch/dela/core/store/hashtree/binprefix"
"go.dedis.ch/dela/core/store/kv"
"go.dedis.ch/dela/core/txn/pool"
poolimpl "go.dedis.ch/dela/core/txn/pool/gossip"
"go.dedis.ch/dela/core/txn/signed"
"go.dedis.ch/dela/core/validation/simple"
"go.dedis.ch/dela/cosi/threshold"
"go.dedis.ch/dela/crypto/bls"
"go.dedis.ch/dela/crypto/loader"
"go.dedis.ch/dela/mino"
"go.dedis.ch/dela/mino/gossip"
"go.dedis.ch/dela/serde/json"
"golang.org/x/xerrors"
)

Expand Down Expand Up @@ -130,7 +130,7 @@
rosterFac := authority.NewFactory(onet.GetAddressFactory(), cosi.GetPublicKeyFactory())
cosipbft.RegisterRosterContract(exec, rosterFac, access)

value.RegisterContract(exec, value.NewContract(valueAccessKey[:], access))

Check failure on line 133 in cli/cosipbftcontroller/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

too many arguments in call to value.NewContract

Check failure on line 133 in cli/cosipbftcontroller/mod.go

View workflow job for this annotation

GitHub Actions / Scenario 

too many arguments in call to value.NewContract

Check failure on line 133 in cli/cosipbftcontroller/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

too many arguments in call to value.NewContract

Check failure on line 133 in cli/cosipbftcontroller/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

too many arguments in call to value.NewContract

txFac := signed.NewTransactionFactory()
vs := simple.NewService(exec, txFac)
Expand Down
10 changes: 5 additions & 5 deletions cli/cosipbftcontroller/mod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"testing"

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

"github.com/c4dt/d-voting/internal/testing/fake"
"github.com/c4dt/dela/cli"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/store/kv"
"github.com/c4dt/dela/core/txn/pool"
"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/store/kv"
"go.dedis.ch/dela/core/txn/pool"
"github.com/stretchr/testify/require"
)

Expand Down
16 changes: 8 additions & 8 deletions cli/dvoting/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ import (
"github.com/c4dt/d-voting/cli/postinstall"
evoting "github.com/c4dt/d-voting/contracts/evoting/controller"
metrics "github.com/c4dt/d-voting/metrics/controller"
"github.com/c4dt/dela/cli/node"
access "github.com/c4dt/dela/contracts/access/controller"
db "github.com/c4dt/dela/core/store/kv/controller"
pool "github.com/c4dt/dela/core/txn/pool/controller"
signed "github.com/c4dt/dela/core/txn/signed/controller"
mino "github.com/c4dt/dela/mino/minogrpc/controller"
proxy "github.com/c4dt/dela/mino/proxy/http/controller"
"go.dedis.ch/dela/cli/node"
access "go.dedis.ch/dela/contracts/access/controller"
db "go.dedis.ch/dela/core/store/kv/controller"
pool "go.dedis.ch/dela/core/txn/pool/controller"
signed "go.dedis.ch/dela/core/txn/signed/controller"
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"

gapi "github.com/c4dt/dela-apps/gapi/controller"
gapi "go.dedis.ch/dela-apps/gapi/controller"
)

func main() {
Expand Down
10 changes: 5 additions & 5 deletions cli/postinstall/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
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"
"github.com/c4dt/dela"
"github.com/c4dt/dela/cli"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/mino/proxy"
"github.com/c4dt/dela/mino/proxy/http"
"go.dedis.ch/dela"
"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/mino/proxy"
"go.dedis.ch/dela/mino/proxy/http"
"golang.org/x/xerrors"
)

Expand Down
32 changes: 16 additions & 16 deletions contracts/evoting/controller/action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ import (
ptypes "github.com/c4dt/d-voting/proxy/types"
"github.com/c4dt/d-voting/services/dkg"
"github.com/c4dt/d-voting/services/shuffle"
"github.com/c4dt/dela"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/ordering/cosipbft/blockstore"
"github.com/c4dt/dela/core/txn"
"github.com/c4dt/dela/core/txn/pool"
"github.com/c4dt/dela/core/txn/signed"
"github.com/c4dt/dela/core/validation"
"github.com/c4dt/dela/crypto"
"github.com/c4dt/dela/crypto/bls"
"github.com/c4dt/dela/crypto/loader"
"github.com/c4dt/dela/mino"
"github.com/c4dt/dela/mino/proxy"
"github.com/c4dt/dela/serde"
sjson "github.com/c4dt/dela/serde/json"
"go.dedis.ch/dela"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/ordering/cosipbft/blockstore"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/dela/core/txn/pool"
"go.dedis.ch/dela/core/txn/signed"
"go.dedis.ch/dela/core/validation"
"go.dedis.ch/dela/crypto"
"go.dedis.ch/dela/crypto/bls"
"go.dedis.ch/dela/crypto/loader"
"go.dedis.ch/dela/mino"
"go.dedis.ch/dela/mino/proxy"
"go.dedis.ch/dela/serde"
sjson "go.dedis.ch/dela/serde/json"
"github.com/gorilla/mux"
"golang.org/x/xerrors"
)
Expand Down
10 changes: 5 additions & 5 deletions contracts/evoting/controller/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package controller

import (
"github.com/c4dt/dela/cli"
"github.com/c4dt/dela/cli/node"
"github.com/c4dt/dela/core/access"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/validation"
"go.dedis.ch/dela/cli"
"go.dedis.ch/dela/cli/node"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/validation"
)

// NewController returns a new controller initializer
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/controller/mod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package controller
import (
"testing"

"github.com/c4dt/dela/cli/node"
"go.dedis.ch/dela/cli/node"
"github.com/stretchr/testify/require"
)

Expand Down
18 changes: 9 additions & 9 deletions contracts/evoting/evoting.go
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package json

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

Expand Down
6 changes: 3 additions & 3 deletions contracts/evoting/json/forms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"

"github.com/c4dt/d-voting/contracts/evoting/types"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
ctypes "github.com/c4dt/dela/core/ordering/cosipbft/types"
"github.com/c4dt/dela/serde"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
ctypes "go.dedis.ch/dela/core/ordering/cosipbft/types"
"go.dedis.ch/dela/serde"
"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/suites"
"golang.org/x/xerrors"
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package json

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

// Register the JSON formats for the form, ciphervote, and transaction
Expand Down
2 changes: 1 addition & 1 deletion contracts/evoting/json/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"

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

Expand Down
16 changes: 8 additions & 8 deletions contracts/evoting/mod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
dvoting "github.com/c4dt/d-voting"
"github.com/c4dt/d-voting/contracts/evoting/types"
"github.com/c4dt/d-voting/services/dkg"
"github.com/c4dt/dela/core/access"
"github.com/c4dt/dela/core/execution"
"github.com/c4dt/dela/core/execution/native"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/store"
"github.com/c4dt/dela/serde"
"github.com/c4dt/dela/serde/json"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/execution"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/store"
"go.dedis.ch/dela/serde"
"go.dedis.ch/dela/serde/json"
"github.com/prometheus/client_golang/prometheus"

"go.dedis.ch/kyber/v3/proof"
Expand Down Expand Up @@ -68,7 +68,7 @@

const (
// ContractName is the name of the contract.
ContractName = "github.com/c4dt/dela.Evoting"
ContractName = "go.dedis.ch/dela.Evoting"

// CmdArg is the argument's name to indicate the kind of command we want to
// run on the contract. Should be one of the Command type.
Expand Down Expand Up @@ -132,7 +132,7 @@

// RegisterContract registers the value contract to the given execution service.
func RegisterContract(exec *native.Service, c Contract) {
exec.Set(ContractName, c)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Integration test 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Scenario 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Test crash 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Test bad vote 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID) (compile)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Tests 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID) (compile)

Check failure on line 135 in contracts/evoting/mod.go

View workflow job for this annotation

GitHub Actions / Test revote 

cannot use c (variable of type Contract) as native.Contract value in argument to exec.Set: Contract does not implement native.Contract (missing method UID)
}

// Contract is a smart contract that allows one to execute evoting commands
Expand Down
24 changes: 12 additions & 12 deletions contracts/evoting/mod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ import (
"github.com/c4dt/d-voting/contracts/evoting/types"
"github.com/c4dt/d-voting/internal/testing/fake"
"github.com/c4dt/d-voting/services/dkg"
"github.com/c4dt/dela/core/access"
"github.com/c4dt/dela/core/execution"
"github.com/c4dt/dela/core/execution/native"
"github.com/c4dt/dela/core/ordering"
"github.com/c4dt/dela/core/ordering/cosipbft/authority"
"github.com/c4dt/dela/core/store"
"github.com/c4dt/dela/core/txn"
"github.com/c4dt/dela/core/txn/signed"
"github.com/c4dt/dela/crypto"
"github.com/c4dt/dela/crypto/bls"
"github.com/c4dt/dela/serde"
sjson "github.com/c4dt/dela/serde/json"
"go.dedis.ch/dela/core/access"
"go.dedis.ch/dela/core/execution"
"go.dedis.ch/dela/core/execution/native"
"go.dedis.ch/dela/core/ordering"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
"go.dedis.ch/dela/core/store"
"go.dedis.ch/dela/core/txn"
"go.dedis.ch/dela/core/txn/signed"
"go.dedis.ch/dela/crypto"
"go.dedis.ch/dela/crypto/bls"
"go.dedis.ch/dela/serde"
sjson "go.dedis.ch/dela/serde/json"
"github.com/prometheus/client_golang/prometheus/testutil"
"github.com/stretchr/testify/require"
"go.dedis.ch/kyber/v3"
Expand Down
4 changes: 2 additions & 2 deletions contracts/evoting/types/ciphervote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"io"

"github.com/c4dt/dela/serde"
"github.com/c4dt/dela/serde/registry"
"go.dedis.ch/dela/serde"
"go.dedis.ch/dela/serde/registry"
"go.dedis.ch/kyber/v3"
"golang.org/x/xerrors"
)
Expand Down
8 changes: 4 additions & 4 deletions contracts/evoting/types/election.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package types
import (
"io"

"github.com/c4dt/dela/core/ordering/cosipbft/authority"
ctypes "github.com/c4dt/dela/core/ordering/cosipbft/types"
"github.com/c4dt/dela/serde"
"github.com/c4dt/dela/serde/registry"
"go.dedis.ch/dela/core/ordering/cosipbft/authority"
ctypes "go.dedis.ch/dela/core/ordering/cosipbft/types"
"go.dedis.ch/dela/serde"
"go.dedis.ch/dela/serde/registry"
"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/suites"
"golang.org/x/xerrors"
Expand Down
Loading
Loading