feat: fix after rebase

bitcoin-sv · Dec 5, 2024 · 0712138 · 0712138
1 parent 028e475
commit 0712138
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/internal/blocktx/integration_test/helpers.go b/internal/blocktx/integration_test/helpers.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/bitcoin-sv/arc/internal/blocktx"
-	blockchain "github.com/bitcoin-sv/arc/internal/blocktx/blockchain_communication"
-	blocktx_p2p "github.com/bitcoin-sv/arc/internal/blocktx/blockchain_communication/p2p"
+	"github.com/bitcoin-sv/arc/internal/blocktx/bcnet"
+	blocktx_p2p "github.com/bitcoin-sv/arc/internal/blocktx/bcnet/p2p"
 	"github.com/bitcoin-sv/arc/internal/blocktx/blocktx_api"
 	"github.com/bitcoin-sv/arc/internal/blocktx/store/postgresql"
 	"github.com/bitcoin-sv/arc/internal/message_queue/nats/client/nats_core"
@@ -24,7 +24,7 @@ func setupSut(t *testing.T, dbInfo string) (*blocktx.Processor, *blocktx_p2p.Msg
 
 	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelDebug}))
 
-	blockProcessCh := make(chan *blockchain.BlockMessage, 10)
+	blockProcessCh := make(chan *bcnet.BlockMessage, 10)
 
 	publishedTxsCh := make(chan *blocktx_api.TransactionBlock, 10)
 

diff --git a/internal/blocktx/integration_test/reorg_integration_test.go b/internal/blocktx/integration_test/reorg_integration_test.go
@@ -35,7 +35,7 @@ import (
 	"testing"
 	"time"
 
-	blockchain "github.com/bitcoin-sv/arc/internal/blocktx/blockchain_communication"
+	"github.com/bitcoin-sv/arc/internal/blocktx/bcnet"
 	"github.com/bitcoin-sv/arc/internal/blocktx/blocktx_api"
 	testutils "github.com/bitcoin-sv/arc/internal/test_utils"
 	_ "github.com/golang-migrate/migrate/v4/source/file"
@@ -109,7 +109,7 @@ func TestReorg(t *testing.T) {
 		require.NoError(t, err)
 
 		// should become LONGEST
-		blockMessage := &blockchain.BlockMessage{
+		blockMessage := &bcnet.BlockMessage{
 			Hash: blockHash,
 			Header: &wire.BlockHeader{
 				Version:    541065216,
@@ -152,7 +152,7 @@ func TestReorg(t *testing.T) {
 		merkleRoot := treeStore[len(treeStore)-1]
 
 		// should become STALE
-		blockMessage := &blockchain.BlockMessage{
+		blockMessage := &bcnet.BlockMessage{
 			Hash: blockHash,
 			Header: &wire.BlockHeader{
 				Version:    541065216,
@@ -210,7 +210,7 @@ func TestReorg(t *testing.T) {
 
 		// should become LONGEST
 		// reorg should happen
-		blockMessage := &blockchain.BlockMessage{
+		blockMessage := &bcnet.BlockMessage{
 			Hash: blockHash,
 			Header: &wire.BlockHeader{
 				Version:    541065216,
@@ -296,7 +296,7 @@ func TestReorg(t *testing.T) {
 		prevhash := testutils.RevChainhash(t, blockHash822020Orphan)
 
 		// should become STALE
-		blockMessage := &blockchain.BlockMessage{
+		blockMessage := &bcnet.BlockMessage{
 			Hash: blockHash,
 			Header: &wire.BlockHeader{
 				Version:    541065216,
@@ -368,7 +368,7 @@ func TestReorg(t *testing.T) {
 
 		// should become LONGEST
 		// reorg should happen
-		blockMessage := &blockchain.BlockMessage{
+		blockMessage := &bcnet.BlockMessage{
 			Hash: blockHash,
 			Header: &wire.BlockHeader{
 				Version:    541065216,