diff --git a/domain/blockdag/test_utils.go b/domain/blockdag/test_utils.go index fdb034223..f6aee6643 100644 --- a/domain/blockdag/test_utils.go +++ b/domain/blockdag/test_utils.go @@ -317,8 +317,10 @@ func PrepareBlockForTest(dag *BlockDAG, parentHashes []*daghash.Hash, transactio timestamp := node.parents.bluest().PastMedianTime(dag) msgBlock.Header = appmessage.BlockHeader{ - Version: blockVersion, - ParentHashes: parentHashes, + Version: blockVersion, + + // We use parents.hashes() and not parentHashes because parents.hashes() is sorted. + ParentHashes: parents.hashes(), HashMerkleRoot: hashMerkleTree.Root(), AcceptedIDMerkleRoot: calculatedAccepetedIDMerkleRoot, UTXOCommitment: &calculatedMultisetHash, diff --git a/infrastructure/network/netadapter/standalone/minimal_net_adapter.go b/infrastructure/network/netadapter/standalone/minimal_net_adapter.go index fad5f9d43..c13c5d8f6 100644 --- a/infrastructure/network/netadapter/standalone/minimal_net_adapter.go +++ b/infrastructure/network/netadapter/standalone/minimal_net_adapter.go @@ -1,10 +1,11 @@ package standalone import ( - "github.com/kaspanet/kaspad/util/mstime" "sync" "github.com/kaspanet/kaspad/app/protocol/common" + "github.com/kaspanet/kaspad/util/mstime" + "github.com/kaspanet/kaspad/infrastructure/network/netadapter/id" "github.com/kaspanet/kaspad/app/appmessage"