blocksync: remove v0 folder structure (#7128)

Remove v0 blocksync folder structure.
This commit is contained in:
Marko
2021-10-15 13:03:53 +00:00
committed by GitHub
parent 006e6108a1
commit 66a11fe527
5 changed files with 11 additions and 12 deletions
@@ -1,4 +1,4 @@
package v0
package blocksync
import (
"errors"
@@ -1,4 +1,4 @@
package v0
package blocksync
import (
"fmt"
@@ -1,4 +1,4 @@
package v0
package blocksync
import (
"fmt"
@@ -6,7 +6,6 @@ import (
"sync"
"time"
"github.com/tendermint/tendermint/internal/blocksync"
"github.com/tendermint/tendermint/internal/consensus"
"github.com/tendermint/tendermint/internal/p2p"
sm "github.com/tendermint/tendermint/internal/state"
@@ -36,7 +35,7 @@ var (
Priority: 5,
SendQueueCapacity: 1000,
RecvBufferCapacity: 1024,
RecvMessageCapacity: blocksync.MaxMsgSize,
RecvMessageCapacity: MaxMsgSize,
MaxSendBytes: 100,
},
},
@@ -1,4 +1,4 @@
package v0
package blocksync
import (
"os"
+6 -6
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{