Skip to content

Commit

Permalink
use celestiaorg instead of lazyledger (#28)
Browse files Browse the repository at this point in the history 
* use celestiaorg instead of lazyledger

* try some changes to fix go mod

* use older version of golang/mock in order to get tests to pass

* use the branch of celestia-core that restores some unused code (will use master later)

* regenerate proto files

* fix links

Co-authored-by: Nguyen Nhu Viet <braveryandglory@gmail.com>

* use latest commit of celestia-core

* add version that was somehow missing?

Co-authored-by: Nguyen Nhu Viet <braveryandglory@gmail.com>
  • Loading branch information
@evan-forbes @Bidon15
evan-forbes and Bidon15 committed Sep 1, 2021
1 parent 3addd7f commit 42cf598
Show file tree
Hide file tree
Showing 358 changed files with 1,635 additions and 1,407 deletions.
4 changes: 2 additions & 2 deletions baseapp/abci.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"syscall"
"time"

abci "github.com/celestiaorg/celestia-core/abci/types"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/gogo/protobuf/proto"
abci "github.com/lazyledger/lazyledger-core/abci/types"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
"google.golang.org/grpc/codes"
grpcstatus "google.golang.org/grpc/status"

Expand Down
4 changes: 2 additions & 2 deletions baseapp/abci_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

abci "github.com/lazyledger/lazyledger-core/abci/types"
tmprototypes "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
abci "github.com/celestiaorg/celestia-core/abci/types"
tmprototypes "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/stretchr/testify/require"
dbm "github.com/tendermint/tm-db"

Expand Down
8 changes: 4 additions & 4 deletions baseapp/baseapp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"reflect"
"strings"

abci "github.com/celestiaorg/celestia-core/abci/types"
"github.com/celestiaorg/celestia-core/crypto/tmhash"
"github.com/celestiaorg/celestia-core/libs/log"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/gogo/protobuf/proto"
abci "github.com/lazyledger/lazyledger-core/abci/types"
"github.com/lazyledger/lazyledger-core/crypto/tmhash"
"github.com/lazyledger/lazyledger-core/libs/log"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"

"github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
6 changes: 3 additions & 3 deletions baseapp/baseapp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"testing"
"time"

abci "github.com/celestiaorg/celestia-core/abci/types"
"github.com/celestiaorg/celestia-core/libs/log"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/gogo/protobuf/jsonpb"
abci "github.com/lazyledger/lazyledger-core/abci/types"
"github.com/lazyledger/lazyledger-core/libs/log"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
dbm "github.com/tendermint/tm-db"
Expand Down
2 changes: 1 addition & 1 deletion baseapp/grpcrouter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package baseapp
import (
"fmt"

abci "github.com/celestiaorg/celestia-core/abci/types"
gogogrpc "github.com/gogo/protobuf/grpc"
abci "github.com/lazyledger/lazyledger-core/abci/types"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
"google.golang.org/grpc/encoding/proto"
Expand Down
2 changes: 1 addition & 1 deletion baseapp/grpcrouter_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
gocontext "context"
"fmt"

abci "github.com/celestiaorg/celestia-core/abci/types"
gogogrpc "github.com/gogo/protobuf/grpc"
abci "github.com/lazyledger/lazyledger-core/abci/types"
"google.golang.org/grpc"

"github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
2 changes: 1 addition & 1 deletion baseapp/grpcrouter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/lazyledger/lazyledger-core/libs/log"
"github.com/celestiaorg/celestia-core/libs/log"
"github.com/stretchr/testify/require"
dbm "github.com/tendermint/tm-db"

Expand Down
6 changes: 3 additions & 3 deletions baseapp/msg_service_router_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"os"
"testing"

abci "github.com/lazyledger/lazyledger-core/abci/types"
"github.com/lazyledger/lazyledger-core/libs/log"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
abci "github.com/celestiaorg/celestia-core/abci/types"
"github.com/celestiaorg/celestia-core/libs/log"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/stretchr/testify/require"
dbm "github.com/tendermint/tm-db"

Expand Down
4 changes: 2 additions & 2 deletions baseapp/params.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

abci "github.com/lazyledger/lazyledger-core/abci/types"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
abci "github.com/celestiaorg/celestia-core/abci/types"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
4 changes: 2 additions & 2 deletions baseapp/params_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package baseapp_test
import (
"testing"

abci "github.com/lazyledger/lazyledger-core/abci/types"
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
abci "github.com/celestiaorg/celestia-core/abci/types"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/baseapp"
Expand Down
2 changes: 1 addition & 1 deletion baseapp/queryrouter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/require"

abci "github.com/lazyledger/lazyledger-core/abci/types"
abci "github.com/celestiaorg/celestia-core/abci/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion baseapp/test_helpers.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package baseapp

import (
tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down
2 changes: 2 additions & 0 deletions buf.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version: v1beta1

build:
roots:
- proto
Expand Down
4 changes: 2 additions & 2 deletions client/broadcast.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/lazyledger/lazyledger-core/crypto/tmhash"
"github.com/lazyledger/lazyledger-core/mempool"
"github.com/celestiaorg/celestia-core/crypto/tmhash"
"github.com/celestiaorg/celestia-core/mempool"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

Expand Down
10 changes: 5 additions & 5 deletions client/broadcast_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"testing"

"github.com/lazyledger/lazyledger-core/crypto/tmhash"
"github.com/lazyledger/lazyledger-core/mempool"
"github.com/lazyledger/lazyledger-core/rpc/client/mock"
ctypes "github.com/lazyledger/lazyledger-core/rpc/core/types"
tmtypes "github.com/lazyledger/lazyledger-core/types"
"github.com/celestiaorg/celestia-core/crypto/tmhash"
"github.com/celestiaorg/celestia-core/mempool"
"github.com/celestiaorg/celestia-core/rpc/client/mock"
ctypes "github.com/celestiaorg/celestia-core/rpc/core/types"
tmtypes "github.com/celestiaorg/celestia-core/types"
"github.com/stretchr/testify/require"

"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
4 changes: 2 additions & 2 deletions client/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/lazyledger/lazyledger-core/libs/cli"
rpchttp "github.com/lazyledger/lazyledger-core/rpc/client/http"
"github.com/celestiaorg/celestia-core/libs/cli"
rpchttp "github.com/celestiaorg/celestia-core/rpc/client/http"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down
2 changes: 1 addition & 1 deletion client/context.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"gopkg.in/yaml.v2"

rpcclient "github.com/celestiaorg/celestia-core/rpc/client"
"github.com/gogo/protobuf/proto"
rpcclient "github.com/lazyledger/lazyledger-core/rpc/client"
"github.com/pkg/errors"

"github.com/cosmos/cosmos-sdk/codec"
Expand Down
2 changes: 1 addition & 1 deletion client/flags/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strconv"

tmcli "github.com/lazyledger/lazyledger-core/libs/cli"
tmcli "github.com/celestiaorg/celestia-core/libs/cli"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/crypto/keyring"
Expand Down
2 changes: 1 addition & 1 deletion client/grpc/reflection/reflection_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
tmproto "github.com/celestiaorg/celestia-core/proto/tendermint/types"
"github.com/stretchr/testify/suite"

"github.com/cosmos/cosmos-sdk/baseapp"
Expand Down
2 changes: 1 addition & 1 deletion client/grpc/tmservice/block.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tmservice
import (
"context"

ctypes "github.com/lazyledger/lazyledger-core/rpc/core/types"
ctypes "github.com/celestiaorg/celestia-core/rpc/core/types"

"github.com/cosmos/cosmos-sdk/client"
)
Expand Down
4 changes: 2 additions & 2 deletions client/grpc/tmservice/query.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 client/grpc/tmservice/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package tmservice
import (
"context"

ctypes "github.com/lazyledger/lazyledger-core/rpc/core/types"
ctypes "github.com/celestiaorg/celestia-core/rpc/core/types"

"github.com/cosmos/cosmos-sdk/client"
)
Expand Down
2 changes: 1 addition & 1 deletion client/grpc_query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"reflect"
"strconv"

abci "github.com/celestiaorg/celestia-core/abci/types"
gogogrpc "github.com/gogo/protobuf/grpc"
abci "github.com/lazyledger/lazyledger-core/abci/types"
"google.golang.org/grpc"
"google.golang.org/grpc/encoding"
"google.golang.org/grpc/encoding/proto"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/add.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"sort"

"github.com/celestiaorg/celestia-core/libs/cli"
bip39 "github.com/cosmos/go-bip39"
"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/add_ledger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/add_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/list.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keys

import (
"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/migrate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"testing"

"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"
"github.com/otiai10/copy"
"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion client/keys/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"io"
"strings"

"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"
"github.com/spf13/cobra"
yaml "gopkg.in/yaml.v2"

Expand Down
2 changes: 1 addition & 1 deletion client/keys/root.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keys

import (
"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
2 changes: 1 addition & 1 deletion client/keys/show.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

"github.com/lazyledger/lazyledger-core/libs/cli"
"github.com/celestiaorg/celestia-core/libs/cli"
"github.com/spf13/cobra"

"github.com/cosmos/cosmos-sdk/client"
Expand Down
6 changes: 3 additions & 3 deletions client/query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/pkg/errors"

abci "github.com/lazyledger/lazyledger-core/abci/types"
tmbytes "github.com/lazyledger/lazyledger-core/libs/bytes"
rpcclient "github.com/lazyledger/lazyledger-core/rpc/client"
abci "github.com/celestiaorg/celestia-core/abci/types"
tmbytes "github.com/celestiaorg/celestia-core/libs/bytes"
rpcclient "github.com/celestiaorg/celestia-core/rpc/client"

"github.com/cosmos/cosmos-sdk/store/rootmulti"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/rpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

ctypes "github.com/lazyledger/lazyledger-core/rpc/core/types"
ctypes "github.com/celestiaorg/celestia-core/rpc/core/types"
"github.com/stretchr/testify/suite"

"github.com/cosmos/cosmos-sdk/client/rpc"
Expand Down
6 changes: 3 additions & 3 deletions client/rpc/status.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (

"github.com/spf13/cobra"

"github.com/lazyledger/lazyledger-core/libs/bytes"
"github.com/lazyledger/lazyledger-core/p2p"
ctypes "github.com/lazyledger/lazyledger-core/rpc/core/types"
"github.com/celestiaorg/celestia-core/libs/bytes"
"github.com/celestiaorg/celestia-core/p2p"
ctypes "github.com/celestiaorg/celestia-core/rpc/core/types"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
2 changes: 1 addition & 1 deletion client/rpc/validators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/gorilla/mux"
"github.com/spf13/cobra"

tmtypes "github.com/lazyledger/lazyledger-core/types"
tmtypes "github.com/celestiaorg/celestia-core/types"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
Expand Down
2 changes: 1 addition & 1 deletion codec/amino.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"io"

tmtypes "github.com/lazyledger/lazyledger-core/types"
tmtypes "github.com/celestiaorg/celestia-core/types"
amino "github.com/tendermint/go-amino"

"github.com/cosmos/cosmos-sdk/codec/types"
Expand Down
6 changes: 3 additions & 3 deletions crypto/armor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/hex"
"fmt"

"github.com/lazyledger/lazyledger-core/crypto"
"github.com/lazyledger/lazyledger-core/crypto/armor"
"github.com/lazyledger/lazyledger-core/crypto/xsalsa20symmetric"
"github.com/celestiaorg/celestia-core/crypto"
"github.com/celestiaorg/celestia-core/crypto/armor"
"github.com/celestiaorg/celestia-core/crypto/xsalsa20symmetric"
"github.com/tendermint/crypto/bcrypt"

"github.com/cosmos/cosmos-sdk/codec/legacy"
Expand Down
Loading

0 comments on commit 42cf598

Please sign in to comment.