Skip to content

Commit

Permalink
0.34.x: replace tendermint/tendermint for cometbft/cometbft (celestia…
Browse files Browse the repository at this point in the history 
…org#156)

* Replacing tendermint/tendermint for cometbft/cometbft and making necessary adjustments in Makefile, go.sum and go.mod to use the updated names

* Fixing lint issues

* trying to get more info on which files were not linted properly

* Revert "trying to get more info on which files were not linted properly"

This reverts commit 5677fa3c9292c5f4c2d14c9b0ef4819f3980ac28.

* Fixing lint issues

* Fixing lint issues
  • Loading branch information
@lasarojc
lasarojc authored Jan 24, 2023
1 parent 0cb4b37 commit 16d9426
Show file tree
Hide file tree
Showing 511 changed files with 2,067 additions and 2,070 deletions.
6 changes: 3 additions & 3 deletions abci/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"sync"

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

const (
Expand Down
8 changes: 4 additions & 4 deletions abci/client/grpc_client.go
View file
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/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/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
"github.com/cometbft/cometbft/libs/service"
cmtsync "github.com/cometbft/cometbft/libs/sync"
)

var _ Client = (*grpcClient)(nil)
Expand Down
6 changes: 3 additions & 3 deletions abci/client/local_client.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package abcicli

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

var _ Client = (*localClient)(nil)
Expand Down
6 changes: 3 additions & 3 deletions abci/client/mocks/client.go
View file

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
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"reflect"
"time"

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

const (
Expand Down
10 changes: 5 additions & 5 deletions abci/client/socket_client_test.go
View file
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/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"
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"
)

func TestProperSyncCalls(t *testing.T) {
Expand Down
24 changes: 12 additions & 12 deletions abci/cmd/abci-cli/abci-cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ import (

"github.com/spf13/cobra"

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

// 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/binary"
"fmt"

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

type Application struct {
Expand Down
16 changes: 8 additions & 8 deletions abci/example/example_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import (

"golang.org/x/net/context"

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

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

import (
"github.com/tendermint/tendermint/abci/types"
cmtrand "github.com/tendermint/tendermint/libs/rand"
"github.com/cometbft/cometbft/abci/types"
cmtrand "github.com/cometbft/cometbft/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
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/tendermint/tendermint/abci/example/code"
"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/version"
"github.com/cometbft/cometbft/abci/example/code"
"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/version"
)

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

"github.com/stretchr/testify/require"

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

const (
Expand Down
10 changes: 5 additions & 5 deletions abci/example/kvstore/persistent_kvstore.go
View file
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/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"
"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"
)

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

"google.golang.org/grpc"

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

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

"github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/libs/service"
"github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/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
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"os"
"runtime"

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

// var maxNumberConnections = 2
Expand Down
4 changes: 2 additions & 2 deletions abci/tests/benchmarks/parallel/parallel.go
View file
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"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions abci/tests/benchmarks/simple/simple.go
View file
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"
cmtnet "github.com/tendermint/tendermint/libs/net"
"github.com/cometbft/cometbft/abci/types"
cmtnet "github.com/cometbft/cometbft/libs/net"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions abci/tests/client_server_test.go
View file
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/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/abci/example/kvstore"
abciserver "github.com/tendermint/tendermint/abci/server"
abciclient "github.com/cometbft/cometbft/abci/client"
"github.com/cometbft/cometbft/abci/example/kvstore"
abciserver "github.com/cometbft/cometbft/abci/server"
)

func TestClientServerNoAddrPrefix(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions abci/tests/server/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"fmt"

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

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

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

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

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

var abciType string
Expand Down
2 changes: 1 addition & 1 deletion abci/types/messages_test.go
View file
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/tendermint/tendermint/proto/tendermint/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
)

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

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

func Ed25519ValidatorUpdate(pk []byte, power int64) ValidatorUpdate {
Expand Down
4 changes: 2 additions & 2 deletions abci/types/types.pb.go
View file

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

2 changes: 1 addition & 1 deletion abci/version/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package version

import (
"github.com/tendermint/tendermint/version"
"github.com/cometbft/cometbft/version"
)

// TODO: eliminate this after some version refactor
Expand Down
2 changes: 1 addition & 1 deletion behaviour/peer_behaviour.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package behaviour

import (
"github.com/tendermint/tendermint/p2p"
"github.com/cometbft/cometbft/p2p"
)

// PeerBehaviour is a struct describing a behaviour a peer performed.
Expand Down
4 changes: 2 additions & 2 deletions behaviour/reporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package behaviour
import (
"errors"

cmtsync "github.com/tendermint/tendermint/libs/sync"
"github.com/tendermint/tendermint/p2p"
cmtsync "github.com/cometbft/cometbft/libs/sync"
"github.com/cometbft/cometbft/p2p"
)

// Reporter provides an interface for reactors to report the behaviour
Expand Down
Loading

0 comments on commit 16d9426

Please sign in to comment.