replace tendermint with lazyledger-core in all go files

switch to using lazyledger-core and the fork of the sdk update to the latest verison of lazyledger-core use the latest version of lazyledger-core and the lazyledger fork of the sdk gofmt gofmt
celestiaorg · Jan 30, 2021 · 080f261 · 080f261
1 parent ae2f50f
commit 080f261
Show file tree

Hide file tree

Showing 25 changed files with 132 additions and 88 deletions.
diff --git a/app/app.go b/app/app.go
@@ -10,9 +10,9 @@ import (
 	"github.com/pelletier/go-toml"
 	"github.com/spf13/cast"
 
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
+	abci "github.com/lazyledger/lazyledger-core/abci/types"
+	"github.com/lazyledger/lazyledger-core/libs/log"
+	tmos "github.com/lazyledger/lazyledger-core/libs/os"
 	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -74,9 +74,9 @@ import (
 	"github.com/lazyledger/lazyledger-app/x/lazyledgerapp"
 	lazyledgerappkeeper "github.com/lazyledger/lazyledger-app/x/lazyledgerapp/keeper"
 	lazyledgerapptypes "github.com/lazyledger/lazyledger-app/x/lazyledgerapp/types"
-	tmjson "github.com/tendermint/tendermint/libs/json"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
-	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
+	tmjson "github.com/lazyledger/lazyledger-core/libs/json"
+	tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
+	rpchttp "github.com/lazyledger/lazyledger-core/rpc/client/http"
 	// this line is used by starport scaffolding # stargate/app/moduleImport
 )
 

diff --git a/app/encoding.go b/app/encoding.go
@@ -8,9 +8,9 @@ import (
 // MakeEncodingConfig creates an EncodingConfig for testing
 func MakeEncodingConfig() params.EncodingConfig {
 	encodingConfig := params.MakeEncodingConfig()
-    std.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
-    ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
+	ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 	return encodingConfig
 }
diff --git a/app/export.go b/app/export.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"log"
 
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	tmproto "github.com/lazyledger/lazyledger-core/proto/tendermint/types"
 
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/app/prefix.go b/app/prefix.go
@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	AccountAddressPrefix   = "cosmos"
+	AccountAddressPrefix = "cosmos"
 )
 
 var (

diff --git a/app/types.go b/app/types.go
@@ -1,7 +1,7 @@
 package app
 
 import (
-	abci "github.com/tendermint/tendermint/abci/types"
+	abci "github.com/lazyledger/lazyledger-core/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server/types"
@@ -38,4 +38,3 @@ type CosmosApp interface {
 	// All the registered module account addreses.
 	ModuleAccountAddrs() map[string]bool
 }
-
diff --git a/cmd/lazyledger-appd/cmd/root.go b/cmd/lazyledger-appd/cmd/root.go
@@ -10,11 +10,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/snapshots"
 	"github.com/lazyledger/lazyledger-app/app/params"
 
+	tmcli "github.com/lazyledger/lazyledger-core/libs/cli"
+	"github.com/lazyledger/lazyledger-core/libs/log"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	tmcli "github.com/tendermint/tendermint/libs/cli"
-	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"

diff --git a/go.mod b/go.mod
@@ -3,29 +3,28 @@ module github.com/lazyledger/lazyledger-app
 go 1.15
 
 require (
-	github.com/cosmos/cosmos-sdk v0.41.0
+	github.com/cosmos/cosmos-sdk v0.40.0-rc5
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.4.3
 	github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect
-	github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa // indirect
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
+	github.com/lazyledger/lazyledger-core v0.0.0-20210122184344-b83e6766973c
 	github.com/pelletier/go-toml v1.8.0
 	github.com/regen-network/cosmos-proto v0.3.1
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
-	github.com/tendermint/tendermint v0.34.3
 	github.com/tendermint/tm-db v0.6.3
-	golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
 	golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c // indirect
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect
-	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4
-	google.golang.org/grpc v1.35.0
+	google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f
+	google.golang.org/grpc v1.33.2
 
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/lazyledger/cosmos-sdk v0.40.0-rc5
+	github.com/cosmos/cosmos-sdk => github.com/lazyledger/cosmos-sdk v0.40.0-rc5.0.20210121152417-3addd7f65d1c
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
 )