Browse Source

blocksync: remove v0 folder structure (#7128)

Remove v0 blocksync folder structure.
pull/7130/head
Marko 3 years ago
committed by GitHub
parent
commit
66a11fe527
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions
  1. +1
    -1
      internal/blocksync/pool.go
  2. +1
    -1
      internal/blocksync/pool_test.go
  3. +2
    -3
      internal/blocksync/reactor.go
  4. +1
    -1
      internal/blocksync/reactor_test.go
  5. +6
    -6
      node/setup.go

internal/blocksync/v0/pool.go → internal/blocksync/pool.go View File


internal/blocksync/v0/pool_test.go → internal/blocksync/pool_test.go View File


internal/blocksync/v0/reactor.go → internal/blocksync/reactor.go View File


internal/blocksync/v0/reactor_test.go → internal/blocksync/reactor_test.go View File


+ 6
- 6
node/setup.go View File

@ -12,7 +12,7 @@ import (
abciclient "github.com/tendermint/tendermint/abci/client"
"github.com/tendermint/tendermint/config"
"github.com/tendermint/tendermint/crypto"
bcv0 "github.com/tendermint/tendermint/internal/blocksync/v0"
"github.com/tendermint/tendermint/internal/blocksync"
"github.com/tendermint/tendermint/internal/consensus"
"github.com/tendermint/tendermint/internal/evidence"
"github.com/tendermint/tendermint/internal/mempool"
@ -310,13 +310,13 @@ func createBlockchainReactor(
logger = logger.With("module", "blockchain")
reactorShim := p2p.NewReactorShim(logger, "BlockchainShim", bcv0.ChannelShims)
channels := makeChannelsFromShims(router, bcv0.ChannelShims)
reactorShim := p2p.NewReactorShim(logger, "BlockchainShim", blocksync.ChannelShims)
channels := makeChannelsFromShims(router, blocksync.ChannelShims)
peerUpdates := peerManager.Subscribe()
reactor, err := bcv0.NewReactor(
reactor, err := blocksync.NewReactor(
logger, state.Copy(), blockExec, blockStore, csReactor,
channels[bcv0.BlockSyncChannel], peerUpdates, blockSync,
channels[blocksync.BlockSyncChannel], peerUpdates, blockSync,
metrics,
)
if err != nil {
@ -512,7 +512,7 @@ func makeNodeInfo(
txIndexerStatus = "on"
}
bcChannel := byte(bcv0.BlockSyncChannel)
bcChannel := byte(blocksync.BlockSyncChannel)
nodeInfo := types.NodeInfo{
ProtocolVersion: types.ProtocolVersion{


Loading…
Cancel
Save