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

Jump to bottom

refactor: change go module to dashpay/tenderdash #670

Merged
merged 10 commits into from
Aug 22, 2023
Merged

refactor: change go module to dashpay/tenderdash #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da042e5
refactor: replace "github.com/tendermint/tendermint" to "github.com/d…
shotonoff Aug 11, 2023
73f8121
refactor: replace "github.com/tendermint/tendermint" to "github.com/d…
shotonoff Aug 11, 2023
25c5ce2
Merge branch 'v0.13-dev' into refactor/update-project-go-module
shotonoff Aug 21, 2023
b4ec01d
refactor: sync with v0.13-dev
shotonoff Aug 21, 2023
03afae9
chore: regenerate proto buf
shotonoff Aug 21, 2023
0d67921
chore: regenerate proto files
shotonoff Aug 21, 2023
78dcff5
chore: regenerate proto files
shotonoff Aug 21, 2023
e4e51d3
chore: regenerate proto file
shotonoff Aug 21, 2023
751807d
Merge remote-tracking branch 'origin/refactor/update-project-go-modul…
shotonoff Aug 21, 2023
1fedaaa
chore: regenerate proto files
shotonoff Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions abci/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

sync "github.com/sasha-s/go-deadlock"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/libs/service"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions abci/client/grpc_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
tmnet "github.com/dashpay/tenderdash/libs/net"
"github.com/dashpay/tenderdash/libs/service"
)

// A gRPC client.
Expand Down
6 changes: 3 additions & 3 deletions abci/client/local_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package abciclient
import (
"context"

types "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/libs/service"
types "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/libs/service"
)

// NOTE: use defer to unlock mutex because Application might panic (e.g., in
Expand Down
2 changes: 1 addition & 1 deletion abci/client/mocks/client.go
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions abci/client/socket_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

sync "github.com/sasha-s/go-deadlock"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
tmnet "github.com/dashpay/tenderdash/libs/net"
"github.com/dashpay/tenderdash/libs/service"
)

// This is goroutine-safe, but users should beware that the application in
Expand Down
21 changes: 10 additions & 11 deletions abci/cmd/abci-cli/abci-cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,16 @@ import (

"github.com/spf13/cobra"

"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/version"

abciclient "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/example/kvstore"
"github.com/tendermint/tendermint/abci/server"
servertest "github.com/tendermint/tendermint/abci/tests/server"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/proto/tendermint/crypto"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
abciclient "github.com/dashpay/tenderdash/abci/client"
"github.com/dashpay/tenderdash/abci/example/code"
"github.com/dashpay/tenderdash/abci/example/kvstore"
"github.com/dashpay/tenderdash/abci/server"
servertest "github.com/dashpay/tenderdash/abci/tests/server"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/proto/tendermint/crypto"
tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
"github.com/dashpay/tenderdash/version"
)

// client is a global variable so it can be reused by the console
Expand Down
8 changes: 4 additions & 4 deletions abci/example/counter/counter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"encoding/binary"
"fmt"

"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
tmcrypto "github.com/tendermint/tendermint/crypto"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/dashpay/tenderdash/abci/example/code"
"github.com/dashpay/tenderdash/abci/types"
tmcrypto "github.com/dashpay/tenderdash/crypto"
tmtypes "github.com/dashpay/tenderdash/types"
)

type Application struct {
Expand Down
15 changes: 7 additions & 8 deletions abci/example/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"

abciclient "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/example/kvstore"
abciserver "github.com/tendermint/tendermint/abci/server"
"github.com/tendermint/tendermint/abci/types"
abciclient "github.com/dashpay/tenderdash/abci/client"
"github.com/dashpay/tenderdash/abci/example/code"
"github.com/dashpay/tenderdash/abci/example/kvstore"
abciserver "github.com/dashpay/tenderdash/abci/server"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
tmnet "github.com/dashpay/tenderdash/libs/net"
)

func init() {
Expand Down
8 changes: 4 additions & 4 deletions abci/example/kvstore/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/gogo/protobuf/proto"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/crypto/bls12381"
"github.com/tendermint/tendermint/crypto/encoding"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
"github.com/dashpay/tenderdash/crypto/bls12381"
"github.com/dashpay/tenderdash/crypto/encoding"
)

// Config allows for the setting of high level parameters for running the e2e Application
Expand Down
8 changes: 4 additions & 4 deletions abci/example/kvstore/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package kvstore

import (
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/dash/llmq"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
"github.com/dashpay/tenderdash/dash/llmq"
tmtypes "github.com/dashpay/tenderdash/types"
)

// RandValidatorSetUpdate returns a list of cnt validators for initializing
Expand Down
18 changes: 9 additions & 9 deletions abci/example/kvstore/kvstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ import (
"github.com/gogo/protobuf/proto"
dbm "github.com/tendermint/tm-db"

"github.com/tendermint/tendermint/abci/example/code"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
"github.com/tendermint/tendermint/internal/libs/protoio"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
"github.com/tendermint/tendermint/libs/log"
types1 "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint/version"
"github.com/dashpay/tenderdash/abci/example/code"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
"github.com/dashpay/tenderdash/internal/libs/protoio"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
"github.com/dashpay/tenderdash/libs/log"
types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
"github.com/dashpay/tenderdash/types"
"github.com/dashpay/tenderdash/version"
)

const ProtocolVersion uint64 = 0x12345678
Expand Down
22 changes: 11 additions & 11 deletions abci/example/kvstore/kvstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

abciclient "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/code"
abciserver "github.com/tendermint/tendermint/abci/server"
"github.com/tendermint/tendermint/abci/types"
tmcrypto "github.com/tendermint/tendermint/crypto"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/libs/service"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/tendermint/tendermint/version"
abciclient "github.com/dashpay/tenderdash/abci/client"
"github.com/dashpay/tenderdash/abci/example/code"
abciserver "github.com/dashpay/tenderdash/abci/server"
"github.com/dashpay/tenderdash/abci/types"
tmcrypto "github.com/dashpay/tenderdash/crypto"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/libs/service"
tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
tmtypes "github.com/dashpay/tenderdash/types"
"github.com/dashpay/tenderdash/version"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions abci/example/kvstore/snapshots.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

sync "github.com/sasha-s/go-deadlock"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
"github.com/tendermint/tendermint/libs/ds"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
"github.com/dashpay/tenderdash/libs/ds"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions abci/example/kvstore/state.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

dbm "github.com/tendermint/tm-db"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
types1 "github.com/tendermint/tendermint/types"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
types1 "github.com/dashpay/tenderdash/types"
)

// State represents kvstore app state at some height.
Expand Down
4 changes: 2 additions & 2 deletions abci/example/kvstore/state_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/require"
dbm "github.com/tendermint/tm-db"

"github.com/tendermint/tendermint/crypto"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
"github.com/dashpay/tenderdash/crypto"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
)

func TestStateMarshalUnmarshal(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions abci/example/kvstore/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"fmt"

"github.com/tendermint/tendermint/abci/example/code"
abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/types"
"github.com/dashpay/tenderdash/abci/example/code"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/types"
)

// PrepareTxsFunc prepares transactions, possibly adding and/or removing some of them
Expand Down
10 changes: 5 additions & 5 deletions abci/example/kvstore/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (

"github.com/dashpay/dashd-go/btcjson"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/crypto/encoding"
tmbytes "github.com/tendermint/tendermint/libs/bytes"
types1 "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/tendermint/tendermint/types"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/crypto/encoding"
tmbytes "github.com/dashpay/tenderdash/libs/bytes"
types1 "github.com/dashpay/tenderdash/proto/tendermint/types"
"github.com/dashpay/tenderdash/types"
)

func (app *Application) verifyBlockCommit(qsd types.QuorumSignData, commit abci.CommitInfo) error {
Expand Down
14 changes: 7 additions & 7 deletions abci/example/kvstore/verify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/config"
sm "github.com/tendermint/tendermint/internal/state"
"github.com/tendermint/tendermint/internal/test/factory"
"github.com/tendermint/tendermint/libs/log"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
"github.com/tendermint/tendermint/types"
abci "github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/config"
sm "github.com/dashpay/tenderdash/internal/state"
"github.com/dashpay/tenderdash/internal/test/factory"
"github.com/dashpay/tenderdash/libs/log"
tmproto "github.com/dashpay/tenderdash/proto/tendermint/types"
"github.com/dashpay/tenderdash/types"
)

func TestVerifyBlockCommit(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions abci/server/grpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"google.golang.org/grpc"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
tmnet "github.com/dashpay/tenderdash/libs/net"
"github.com/dashpay/tenderdash/libs/service"
)

type GRPCServer struct {
Expand Down
6 changes: 3 additions & 3 deletions abci/server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ package server
import (
"fmt"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
"github.com/dashpay/tenderdash/libs/service"
)

func NewServer(logger log.Logger, protoAddr, transport string, app types.Application) (service.Service, error) {
Expand Down
8 changes: 4 additions & 4 deletions abci/server/socket_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

sync "github.com/sasha-s/go-deadlock"

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
"github.com/dashpay/tenderdash/abci/types"
"github.com/dashpay/tenderdash/libs/log"
tmnet "github.com/dashpay/tenderdash/libs/net"
"github.com/dashpay/tenderdash/libs/service"
)

// var maxNumberConnections = 2
Expand Down
4 changes: 2 additions & 2 deletions abci/tests/benchmarks/parallel/parallel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"log"

"github.com/tendermint/tendermint/abci/types"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/dashpay/tenderdash/abci/types"
tmnet "github.com/dashpay/tenderdash/libs/net"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions abci/tests/benchmarks/simple/simple.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"log"
"reflect"

"github.com/tendermint/tendermint/abci/types"
tmnet "github.com/tendermint/tendermint/libs/net"
"github.com/dashpay/tenderdash/abci/types"
tmnet "github.com/dashpay/tenderdash/libs/net"
)

func main() {
Expand Down
8 changes: 4 additions & 4 deletions abci/tests/client_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

abciclientent "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/kvstore"
abciserver "github.com/tendermint/tendermint/abci/server"
"github.com/tendermint/tendermint/libs/log"
abciclientent "github.com/dashpay/tenderdash/abci/client"
"github.com/dashpay/tenderdash/abci/example/kvstore"
abciserver "github.com/dashpay/tenderdash/abci/server"
"github.com/dashpay/tenderdash/libs/log"
)

func TestClientServerNoAddrPrefix(t *testing.T) {
Expand Down
Loading
Loading