diff --git a/app/appmessage/domainconverters.go b/app/appmessage/domainconverters.go index 528cbaaa8..7d532acff 100644 --- a/app/appmessage/domainconverters.go +++ b/app/appmessage/domainconverters.go @@ -4,19 +4,11 @@ import ( "encoding/hex" "math/big" -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" - -======= "github.com/pkg/errors" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" "github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo" ->>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" "github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid" diff --git a/app/appmessage/p2p_msgblock_test.go b/app/appmessage/p2p_msgblock_test.go index b071e2fa3..5bd4d1a29 100644 --- a/app/appmessage/p2p_msgblock_test.go +++ b/app/appmessage/p2p_msgblock_test.go @@ -5,25 +5,15 @@ package appmessage import ( -<<<<<<< Updated upstream - "github.com/davecgh/go-spew/spew" - "github.com/zoomy-network/zoomyd/util/mstime" -======= ->>>>>>> Stashed changes "math" "reflect" "testing" -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" - -======= "github.com/davecgh/go-spew/spew" "github.com/zoomy-network/zoomyd/util/mstime" "github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks" ->>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" ) diff --git a/app/appmessage/p2p_msgblockwithtrusteddata.go b/app/appmessage/p2p_msgblockwithtrusteddata.go index a058a453b..b81e8ea47 100644 --- a/app/appmessage/p2p_msgblockwithtrusteddata.go +++ b/app/appmessage/p2p_msgblockwithtrusteddata.go @@ -1,10 +1,6 @@ package appmessage import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" -======= ->>>>>>> Stashed changes "math/big" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" diff --git a/app/protocol/common/common.go b/app/protocol/common/common.go index b61745dfe..7faad18dc 100644 --- a/app/protocol/common/common.go +++ b/app/protocol/common/common.go @@ -1,11 +1,6 @@ package common import ( -<<<<<<< Updated upstream - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "time" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" diff --git a/app/protocol/flowcontext/blocks.go b/app/protocol/flowcontext/blocks.go index 2d13dfd53..4cea8e3b9 100644 --- a/app/protocol/flowcontext/blocks.go +++ b/app/protocol/flowcontext/blocks.go @@ -3,14 +3,6 @@ package flowcontext import ( "time" -<<<<<<< Updated upstream - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flowcontext/network.go b/app/protocol/flowcontext/network.go index 888ae36a4..2f49f0dd6 100644 --- a/app/protocol/flowcontext/network.go +++ b/app/protocol/flowcontext/network.go @@ -1,14 +1,6 @@ package flowcontext import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/common" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/infrastructure/network/connmanager" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" diff --git a/app/protocol/flowcontext/orphans.go b/app/protocol/flowcontext/orphans.go index 5be04d7ea..5688d371c 100644 --- a/app/protocol/flowcontext/orphans.go +++ b/app/protocol/flowcontext/orphans.go @@ -1,14 +1,6 @@ package flowcontext import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" - "github.com/zoomy-network/zoomyd/infrastructure/logger" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" diff --git a/app/protocol/flows/handshake/handshake.go b/app/protocol/flows/handshake/handshake.go index 809740d16..080d915fc 100644 --- a/app/protocol/flows/handshake/handshake.go +++ b/app/protocol/flows/handshake/handshake.go @@ -12,12 +12,6 @@ import ( "github.com/zoomy-network/zoomyd/infrastructure/config" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter" -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" diff --git a/app/protocol/flows/handshake/receiveversion.go b/app/protocol/flows/handshake/receiveversion.go index b2390b96a..d866b0645 100644 --- a/app/protocol/flows/handshake/receiveversion.go +++ b/app/protocol/flows/handshake/receiveversion.go @@ -1,15 +1,6 @@ package handshake import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/common" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/infrastructure/logger" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" diff --git a/app/protocol/flows/handshake/sendversion.go b/app/protocol/flows/handshake/sendversion.go index 26fcda657..8c29da839 100644 --- a/app/protocol/flows/handshake/sendversion.go +++ b/app/protocol/flows/handshake/sendversion.go @@ -1,15 +1,6 @@ package handshake import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/common" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/infrastructure/logger" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" - "github.com/zoomy-network/zoomyd/version" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" diff --git a/app/protocol/flows/ready/ready.go b/app/protocol/flows/ready/ready.go index 31935f751..654ed2a55 100644 --- a/app/protocol/flows/ready/ready.go +++ b/app/protocol/flows/ready/ready.go @@ -1,21 +1,11 @@ package ready import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/common" - "sync/atomic" - - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= "sync/atomic" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" ->>>>>>> Stashed changes "github.com/pkg/errors" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flows/v5/blockrelay/batch_size_test.go b/app/protocol/flows/v5/blockrelay/batch_size_test.go index 095013d44..ff1250861 100644 --- a/app/protocol/flows/v5/blockrelay/batch_size_test.go +++ b/app/protocol/flows/v5/blockrelay/batch_size_test.go @@ -1,10 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "testing" "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" diff --git a/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go b/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go index e990d84ea..f0ed96388 100644 --- a/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go @@ -1,13 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go b/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go index a763c93e2..f8b1f2ec1 100644 --- a/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go +++ b/app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go @@ -1,15 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/domain/consensus/model" - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go b/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go index 0f83d6245..93a3df4fb 100644 --- a/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go @@ -1,16 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/infrastructure/config" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "sync/atomic" "github.com/zoomy-network/zoomyd/app/appmessage" diff --git a/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go b/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go index fae0f052a..4f8fee66c 100644 --- a/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go +++ b/app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go @@ -1,14 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" diff --git a/app/protocol/flows/v5/blockrelay/handle_relay_invs.go b/app/protocol/flows/v5/blockrelay/handle_relay_invs.go index 440ff8f56..3b6f72392 100644 --- a/app/protocol/flows/v5/blockrelay/handle_relay_invs.go +++ b/app/protocol/flows/v5/blockrelay/handle_relay_invs.go @@ -1,22 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/common" - "github.com/zoomy-network/zoomyd/app/protocol/flowcontext" - peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/domain/consensus/model" - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset" - "github.com/zoomy-network/zoomyd/infrastructure/config" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" diff --git a/app/protocol/flows/v5/blockrelay/handle_request_anticone.go b/app/protocol/flows/v5/blockrelay/handle_request_anticone.go index 517c2a3da..bfea5e8f0 100644 --- a/app/protocol/flows/v5/blockrelay/handle_request_anticone.go +++ b/app/protocol/flows/v5/blockrelay/handle_request_anticone.go @@ -1,16 +1,6 @@ package blockrelay import ( -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/app/appmessage" - "github.com/zoomy-network/zoomyd/app/protocol/peer" - "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" - "github.com/zoomy-network/zoomyd/domain" - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/infrastructure/config" - "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router" -======= ->>>>>>> Stashed changes "sort" "github.com/zoomy-network/zoomyd/app/appmessage" diff --git a/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go b/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go index 66563b409..96bcbceb2 100644 --- a/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go +++ b/app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go @@ -2,10 +2,7 @@ package blockrelay import ( "errors" -<<<<<<< Updated upstream -======= ->>>>>>> Stashed changes "github.com/zoomy-network/zoomyd/app/appmessage" "github.com/zoomy-network/zoomyd/app/protocol/common" "github.com/zoomy-network/zoomyd/app/protocol/protocolerrors" diff --git a/domain/consensus/utils/consensushashing/block.go b/domain/consensus/utils/consensushashing/block.go index c0be2c384..8b53db725 100644 --- a/domain/consensus/utils/consensushashing/block.go +++ b/domain/consensus/utils/consensushashing/block.go @@ -3,16 +3,10 @@ package consensushashing import ( "io" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" - -<<<<<<< Updated upstream - "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" - "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" -======= ->>>>>>> Stashed changes "github.com/pkg/errors" "github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi" "github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/serialization" ) // BlockHash returns the given block's hash diff --git a/util/difficulty/difficulty_test.go b/util/difficulty/difficulty_test.go index 7267610ed..c8fa257e1 100644 --- a/util/difficulty/difficulty_test.go +++ b/util/difficulty/difficulty_test.go @@ -2,11 +2,12 @@ package difficulty_test import ( "fmt" - "github.com/zoomy-network/zoomyd/domain/consensus" "math" "math/big" "testing" + "github.com/zoomy-network/zoomyd/domain/consensus" + "github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils" "github.com/zoomy-network/zoomyd/domain/dagconfig" "github.com/zoomy-network/zoomyd/util/difficulty"