From 66a11fe52795eaba6aacae3ca25206c380e5283a Mon Sep 17 00:00:00 2001
From: Marko <marbar3778@yahoo.com>
Date: Fri, 15 Oct 2021 13:03:53 +0000
Subject: [PATCH] blocksync: remove v0 folder structure (#7128)

Remove v0 blocksync folder structure.
---
 internal/blocksync/{v0 => }/pool.go         |  2 +-
 internal/blocksync/{v0 => }/pool_test.go    |  2 +-
 internal/blocksync/{v0 => }/reactor.go      |  5 ++---
 internal/blocksync/{v0 => }/reactor_test.go |  2 +-
 node/setup.go                               | 12 ++++++------
 5 files changed, 11 insertions(+), 12 deletions(-)
 rename internal/blocksync/{v0 => }/pool.go (99%)
 rename internal/blocksync/{v0 => }/pool_test.go (99%)
 rename internal/blocksync/{v0 => }/reactor.go (99%)
 rename internal/blocksync/{v0 => }/reactor_test.go (99%)

diff --git a/internal/blocksync/v0/pool.go b/internal/blocksync/pool.go
similarity index 99%
rename from internal/blocksync/v0/pool.go
rename to internal/blocksync/pool.go
index b3704f333..d10a32b0d 100644
--- a/internal/blocksync/v0/pool.go
+++ b/internal/blocksync/pool.go
@@ -1,4 +1,4 @@
-package v0
+package blocksync
 
 import (
 	"errors"
diff --git a/internal/blocksync/v0/pool_test.go b/internal/blocksync/pool_test.go
similarity index 99%
rename from internal/blocksync/v0/pool_test.go
rename to internal/blocksync/pool_test.go
index 67617d2b7..cbe19acbe 100644
--- a/internal/blocksync/v0/pool_test.go
+++ b/internal/blocksync/pool_test.go
@@ -1,4 +1,4 @@
-package v0
+package blocksync
 
 import (
 	"fmt"
diff --git a/internal/blocksync/v0/reactor.go b/internal/blocksync/reactor.go
similarity index 99%
rename from internal/blocksync/v0/reactor.go
rename to internal/blocksync/reactor.go
index 552dcbda5..0c193577e 100644
--- a/internal/blocksync/v0/reactor.go
+++ b/internal/blocksync/reactor.go
@@ -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,
 			},
 		},
diff --git a/internal/blocksync/v0/reactor_test.go b/internal/blocksync/reactor_test.go
similarity index 99%
rename from internal/blocksync/v0/reactor_test.go
rename to internal/blocksync/reactor_test.go
index 312b1cb39..3824f1460 100644
--- a/internal/blocksync/v0/reactor_test.go
+++ b/internal/blocksync/reactor_test.go
@@ -1,4 +1,4 @@
-package v0
+package blocksync
 
 import (
 	"os"
diff --git a/node/setup.go b/node/setup.go
index ebaa576c2..a3491c995 100644
--- a/node/setup.go
+++ b/node/setup.go
@@ -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{