state: proto migration (#4972)

## Description

the second part of state proto migration

Closes: #XXX
This commit is contained in:
Marko
2020-06-08 12:16:35 +02:00
committed by GitHub
parent bd950c16ea
commit 7a8224f8a3
15 changed files with 335 additions and 147 deletions

View File

@@ -14,6 +14,7 @@ import (
lighthttp "github.com/tendermint/tendermint/light/provider/http"
lightrpc "github.com/tendermint/tendermint/light/rpc"
lightdb "github.com/tendermint/tendermint/light/store/db"
tmstate "github.com/tendermint/tendermint/proto/state"
rpchttp "github.com/tendermint/tendermint/rpc/client/http"
sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types"
@@ -36,14 +37,14 @@ type StateProvider interface {
type lightClientStateProvider struct {
sync.Mutex // light.Client is not concurrency-safe
lc *light.Client
version sm.Version
version tmstate.Version
providers map[lightprovider.Provider]string
}
// NewLightClientStateProvider creates a new StateProvider using a light client and RPC clients.
func NewLightClientStateProvider(
chainID string,
version sm.Version,
version tmstate.Version,
servers []string,
trustOptions light.TrustOptions,
logger log.Logger,

View File

@@ -14,6 +14,7 @@ import (
"github.com/tendermint/tendermint/libs/log"
"github.com/tendermint/tendermint/p2p"
p2pmocks "github.com/tendermint/tendermint/p2p/mocks"
tmstate "github.com/tendermint/tendermint/proto/state"
ssproto "github.com/tendermint/tendermint/proto/statesync"
tmversion "github.com/tendermint/tendermint/proto/version"
"github.com/tendermint/tendermint/proxy"
@@ -44,7 +45,7 @@ func simplePeer(id string) *p2pmocks.Peer {
func TestSyncer_SyncAny(t *testing.T) {
state := sm.State{
ChainID: "chain",
Version: sm.Version{
Version: tmstate.Version{
Consensus: tmversion.Consensus{
Block: version.BlockProtocol,
App: 0,