seedhammer/dcrd
seedhammer/dcrd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chaingen: Prevent dup block names in NextBlock.

Browse Source 
This modifies the chaingen test harness to error when a duplicate block
name is provided to NextBlock to help prevent misuse.

It also orrects a couple of comment typos.
This commit is contained in:
Dave Collins 2018-02-24 11:54:02 -06:00
parent b661ebdfd5
commit 0aa73c02b4
No known key found for this signature in database
GPG Key ID: B8904D9D9C93D1F2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
blockchain/chaingen/generator.go
View File

@ -1701,6 +1701,11 @@ func updateVoteCommitments(block *wire.MsgBlock) {
// - The size of the block will be recalculated unless it was manually changed
// - The block will be solved unless the nonce was changed
func (g *Generator) NextBlock(blockName string, spend *SpendableOut, ticketSpends []SpendableOut, mungers ...func(*wire.MsgBlock)) *wire.MsgBlock {
// Prevent block name collisions.
if g.blocksByName[blockName] != nil {
panic(fmt.Sprintf("block name %s already exists", blockName))
}
// Calculate the next required stake difficulty (aka ticket price).
ticketPrice := dcrutil.Amount(g.calcNextRequiredStakeDifficulty())

9
blockchain/fullblocktests/generate.go
View File

@ -382,11 +382,11 @@ func Generate(includeLargeReorg bool) (tests [][]TestInstance, err error) {
//
// rejectNonCanonicalBlock creates a test instance that encodes the
// provided block using a non-canonical encoded as described by the
// encodeNonCanonicalBlock function and expected it to be rejected.
// encodeNonCanonicalBlock function and expects it to be rejected.
//
// orphanOrRejectBlock creates a test instance that expected the
// provided block to either by accepted as an orphan or rejected by the
// consensus rules.
// orphanOrRejectBlock creates a test instance that expects the provided
// block to either be accepted as an orphan or rejected by the consensus
// rules.
//
// expectTipBlock creates a test instance that expects the provided
// block to be the current tip of the block chain.
@ -1464,7 +1464,6 @@ func Generate(includeLargeReorg bool) (tests [][]TestInstance, err error) {
coinbaseOuts := g.OldestCoinbaseOuts()
outs = append(outs, &coinbaseOuts[0])
ticketOuts = append(ticketOuts, coinbaseOuts[1:])
}
// ---------------------------------------------------------------------