8000 main: replace tendermint/tendermint for cometbft/cometbft by lasarojc · Pull Request #142 · cometbft/cometbft · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

main: replace tendermint/tendermint for cometbft/cometbft #142

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 31 commits into from
Jan 23, 2023
Merged

main: replace tendermint/tendermint for cometbft/cometbft #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7cf8e64
search and replace of tendermint/tendermint, ignoring legitimate link…
lasarojc Jan 17, 2023
3169ec5
search and replace of tendermint/tendermint, ignoring legitimate link…
lasarojc Jan 17, 2023
2764b12
update the go.mod file
lasarojc Jan 17, 2023
97bdbae
use informal's tm-db until cometbft-db releases
lasarojc Jan 17, 2023
372f401
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 17, 2023
2f66bbb
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 18, 2023
36a99f6
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 18, 2023
dfb38fc
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 19, 2023
dc289da
update Makefile to point to renamed repo
lasarojc Jan 19, 2023
6d55a91
Use tm-load-test without circular dependency
lasarojc Jan 19, 2023
c7cff60
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 19, 2023
15c6902
updating mocks
lasarojc Jan 19, 2023
65496ec
placate linter
lasarojc Jan 19, 2023
3b2c2de
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 20, 2023
2d4b7b1
go mod tidy
lasarojc Jan 20, 2023
6845b2c
debugging error in test
lasarojc Jan 20, 2023
3f0cecf
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 20, 2023
430409a
Fix org and repo in generated files
lasarojc Jan 20, 2023
3517c61
Fix org and repo in generated files
lasarojc Jan 20, 2023
a0e67f8
Fixing protobuf file descriptors with make proto-gen
lasarojc Jan 20, 2023
1c19784
Reverting changes in references to issues/PR
lasarojc Jan 20, 2023
87ed597
make proto-gen
thanethomson Jan 20, 2023
b4a0023
Revert "make proto-gen"
thanethomson Jan 20, 2023
f04ba65
debug: Show git diff output when check-generated workflow fails
thanethomson Jan 20, 2023
17a0eb7
debug: Check protoc version in CI
thanethomson Jan 20, 2023
0d9abab
Revert "debug: Check protoc version in CI"
thanethomson Jan 20, 2023
7284202
debug: Try enforcing install of latest buf version
thanethomson Jan 20, 2023
34eeb25
debug: Explicitly install cosmos/gogoproto v1.4.3
thanethomson Jan 20, 2023
9c5a265
Revert "debug: Explicitly install cosmos/gogoproto v1.4.3"
thanethomson Jan 20, 2023
f5b4cf3
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 21, 2023
ae6070a
Merge branch 'main' into lasarojc/126/replace-tendermint-deps
lasarojc Jan 23, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
8000 Expand Up @@ -5,7 +5,7 @@ OUTPUT?=$(BUILDDIR)/cometbft
BUILD_TAGS?=cometbft

COMMIT_HASH := $(shell git rev-parse --short HEAD)
LD_FLAGS = -X github.com/tendermint/tendermint/version.TMGitCommitHash=$(COMMIT_HASH)
LD_FLAGS = -X github.com/cometbft/cometbft/version.TMGitCommitHash=$(COMMIT_HASH)
BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
HTTPS_GIT := https://github.com/cometbft/cometbft.git
CGO_ENABLED ?= 0
Expand Down
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/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
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/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
Open in desktop
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"
)

// NOTE: use defer to unlock mutex because Application might panic (e.g., in
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/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
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/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
22 changes: 11 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 @@ -11,17 +11,17 @@ 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/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/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
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/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
Open in desktop
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
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/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
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/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
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/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
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/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
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/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
Open in desktop
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
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"
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
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"
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
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/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
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/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
2 changes: 1 addition & 1 deletion abci/types/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/cosmos/gogoproto/proto"

"github.com/tendermint/tendermint/libs/protoio"
"github.com/cometbft/cometbft/libs/protoio"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion abci/types/messages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/cosmos/gogoproto/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
2 changes: 1 addition & 1 deletion abci/types/mocks/application.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 abci/types/mocks/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mocks

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

// BaseMock provides a wrapper around the generated Application mock and a BaseApplication.
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/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
Loading
0