Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-06-07 14:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.6.3-dev' into v0.6.4-dev

Browse Source
This commit is contained in:
Ori Newman 2020-08-18 19:03:52 +03:00
commit ce876a7c44
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
domain/blockdag/test_utils.go
View File

@ -317,8 +317,10 @@ func PrepareBlockForTest(dag *BlockDAG, parentHashes []*daghash.Hash, transactio
timestamp := node.parents.bluest().PastMedianTime(dag) timestamp := node.parents.bluest().PastMedianTime(dag)
msgBlock.Header = appmessage.BlockHeader{ msgBlock.Header = appmessage.BlockHeader{
Version: blockVersion, Version: blockVersion,
ParentHashes: parentHashes,
// We use parents.hashes() and not parentHashes because parents.hashes() is sorted.
ParentHashes: parents.hashes(),
HashMerkleRoot: hashMerkleTree.Root(), HashMerkleRoot: hashMerkleTree.Root(),
AcceptedIDMerkleRoot: calculatedAccepetedIDMerkleRoot, AcceptedIDMerkleRoot: calculatedAccepetedIDMerkleRoot,
UTXOCommitment: &calculatedMultisetHash, UTXOCommitment: &calculatedMultisetHash,

3
infrastructure/network/netadapter/standalone/minimal_net_adapter.go
View File

@ -1,10 +1,11 @@
package standalone package standalone
import ( import (
"github.com/kaspanet/kaspad/util/mstime"
"sync" "sync"
"github.com/kaspanet/kaspad/app/protocol/common" "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/infrastructure/network/netadapter/id"
"github.com/kaspanet/kaspad/app/appmessage" "github.com/kaspanet/kaspad/app/appmessage"