8000 Rename package back to tendermint/tendermint and use replace to point… by lasarojc · Pull Request #351 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Rename package back to tendermint/tendermint and use replace to point… #351

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

Merged
merged 8 commits into from
Feb 21, 2023
Merged

Rename package back to tendermint/tendermint and use replace to point… #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e9aedb
Rename package back to tendermint/tendermint and use replace to point…
lasarojc Feb 15, 2023
a0f151c
Rename package back to tendermint/tendermint in the proto files and g…
lasarojc Feb 16, 2023
0f3ad2c
Rename package back to tendermint/tendermint in the mocks
lasarojc Feb 16, 2023
abe800d
Remove useless replace
lasarojc Feb 16, 2023
5ce8935
Merge branch 'v0.34.x' into lasarojc/keep-branches-backward-compatible
lasarojc Feb 17, 2023
f7bb942
Apply suggestions from code review
lasarojc Feb 20, 2023
78498aa
Apply suggestions from code review
lasarojc Feb 20, 2023
6d4c98a
Merge branch 'v0.34.x' into lasarojc/keep-branches-backward-compatible
lasarojc Feb 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 @@ -4,9 +4,9 @@ import (
"fmt"
"sync"

"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/service"
cmtsync "github.com/tendermint/tendermint/libs/sync"
)

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 @@ -9,10 +9,10 @@ import (
"golang.org/x/net/context"
"google.golang.org/grpc"

"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
"github.com/tendermint/tendermint/abci/types"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
cmtsync "github.com/tendermint/tendermint/libs/sync"
)

var _ Client = (*grpcClient)(nil)
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
@@ -1,9 +1,9 @@
package abcicli

import (
types "github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
types "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/service"
cmtsync "github.com/tendermint/tendermint/libs/sync"
)

var _ Client = (*localClient)(nil)
Expand Down
6 changes: 3 additions & 3 deletions 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.

10 changes: 5 additions & 5 deletions abci/client/socket_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"reflect"
"time"

"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
"github.com/cometbft/cometbft/libs/timer"
"github.com/tendermint/tendermint/abci/types"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
cmtsync "github.com/tendermint/tendermint/libs/sync"
"github.com/tendermint/tendermint/libs/timer"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions abci/client/socket_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/server"
"github.com/cometbft/cometbft/abci/types"
cmtrand "github.com/cometbft/cometbft/libs/rand"
"github.com/cometbft/cometbft/libs/service"
abcicli "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/server"
"github.com/tendermint/tendermint/abci/types"
cmtrand "github.com/tendermint/tendermint/libs/rand"
"github.com/tendermint/tendermint/libs/service"
)

func TestProperSyncCalls(t *testing.T) {
Expand Down
24 changes: 12 additions & 12 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 @@ -11,18 +11,18 @@ import (

"github.com/spf13/cobra"

"github.com/cometbft/cometbft/libs/log"
cmtos "github.com/cometbft/cometbft/libs/os"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/example/counter"
"github.com/cometbft/cometbft/abci/example/kvstore"
"github.com/cometbft/cometbft/abci/server"
servertest "github.com/cometbft/cometbft/abci/tests/server"
"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/abci/version"
"github.com/cometbft/cometbft/proto/tendermint/crypto"
"github.com/tendermint/tendermint/libs/log"
cmtos "github.com/tendermint/tendermint/libs/os"

abcicli "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/example/counter"
"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/abci/version"
"github.com/tendermint/tendermint/proto/tendermint/crypto"
)

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

"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/types"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
)

type Application struct {
Expand Down
16 changes: 8 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 @@ -15,14 +15,14 @@ import (

"golang.org/x/net/context"

"github.com/cometbft/cometbft/libs/log"
cmtnet "github.com/cometbft/cometbft/libs/net"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/example/kvstore"
abciserver "github.com/cometbft/cometbft/abci/server"
"github.com/cometbft/cometbft/abci/types"
"github.com/tendermint/tendermint/libs/log"
cmtnet "github.com/tendermint/tendermint/libs/net"

abcicli "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"
)

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

import (
"github.com/cometbft/cometbft/abci/types"
cmtrand "github.com/cometbft/cometbft/libs/rand"
"github.com/tendermint/tendermint/abci/types"
cmtrand "github.com/tendermint/tendermint/libs/rand"
)

// RandVal creates one random validator, with a key derived
Expand Down
6 changes: 3 additions & 3 deletions abci/example/kvstore/kvstore.go
View file
F438 Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

dbm "github.com/cometbft/cometbft-db"

"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/version"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/version"
)

var (
Expand Down
16 changes: 8 additions & 8 deletions abci/example/kvstore/kvstore_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (

"github.com/stretchr/testify/require"

"github.com/cometbft/cometbft/libs/log"
"github.com/cometbft/cometbft/libs/service"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/example/code"
abciserver "github.com/cometbft/cometbft/abci/server"
"github.com/cometbft/cometbft/abci/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/libs/service"

abcicli "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"
cmtproto "github.com/tendermint/tendermint/proto/tendermint/types"
)

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

dbm "github.com/cometbft/cometbft-db"

"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/types"
cryptoenc "github.com/cometbft/cometbft/crypto/encoding"
"github.com/cometbft/cometbft/libs/log"
pc "github.com/cometbft/cometbft/proto/tendermint/crypto"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
"github.com/tendermint/tendermint/libs/log"
pc "github.com/tendermint/tendermint/proto/tendermint/crypto"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions abci/server/grpc_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"google.golang.org/grpc"

"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/cometbft/cometbft/libs/service"
"github.com/tendermint/tendermint/abci/types"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
)

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

"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/service"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/service"
)

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

"github.com/cometbft/cometbft/abci/types"
cmtlog "github.com/cometbft/cometbft/libs/log"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
"github.com/tendermint/tendermint/abci/types"
cmtlog "github.com/tendermint/tendermint/libs/log"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/tendermint/tendermint/libs/service"
cmtsync "github.com/tendermint/tendermint/libs/sync"
)

// 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/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/tendermint/tendermint/abci/types"
cmtnet "github.com/tendermint/tendermint/libs/net"
)

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

"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/tendermint/tendermint/abci/types"
cmtnet "github.com/tendermint/tendermint/libs/net"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions abci/tests/client_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/stretchr/testify/assert"

abciclient "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/example/kvstore"
abciserver "github.com/cometbft/cometbft/abci/server"
abciclient "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/kvstore"
abciserver "github.com/tendermint/tendermint/abci/server"
)

func TestClientServerNoAddrPrefix(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions abci/tests/server/client.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"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/types"
cmtrand "github.com/cometbft/cometbft/libs/rand"
abcicli "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/types"
cmtrand "github.com/tendermint/tendermint/libs/rand"
)

func InitChain(client abcicli.Client) error {
Expand Down
6 changes: 3 additions & 3 deletions abci/tests/test_app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"os"

abcicli "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/log"
abcicli "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/log"
)

func startClient(abciType string) abcicli.Client {
Expand Down
4 changes: 2 additions & 2 deletions abci/tests/test_app/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os/exec"
"time"

"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/types"
"github.com/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
)

var abciType string
Expand Down
2 changes: 1 addition & 1 deletion abci/types/messages_test.go
View file
Open in desktop
B734
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/stretchr/testify/assert"

cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmtproto "github.com/tendermint/tendermint/proto/tendermint/types"
)

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

"github.com/cometbft/cometbft/crypto/ed25519"
cryptoenc "github.com/cometbft/cometbft/crypto/encoding"
"github.com/cometbft/cometbft/crypto/secp256k1"
"github.com/tendermint/tendermint/crypto/ed25519"
cryptoenc "github.com/tendermint/tendermint/crypto/encoding"
"github.com/tendermint/tendermint/crypto/secp256k1"
)

func Ed25519ValidatorUpdate(pk []byte, power int64) ValidatorUpdate {
Expand Down
Loading
0