Skip to content

Simplify startEvaluator() #2812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsachiherman merged 2 commits into from
Aug 30, 2021
Merged

Simplify startEvaluator() #2812

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a59d88c
Simplify startEvaluator().
tolikzinovyev Aug 26, 2021
5fd5db7
PR feedback.
tolikzinovyev Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 30 additions & 27 deletions ledger/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ import (
// ErrNoSpace indicates insufficient space for transaction in block
var ErrNoSpace = errors.New("block does not have space for transaction")

// ErrRoundZero is self-explanatory
var ErrRoundZero = errors.New("cannot start evaluator for round 0")

// maxPaysetHint makes sure that we don't allocate too much memory up front
// in the block evaluator, since there cannot reasonably be more than this
// many transactions in a block.
Expand Down Expand Up @@ -383,20 +386,37 @@ func (l *Ledger) StartEvaluator(hdr bookkeeping.BlockHeader, paysetHint int) (*B
}

func startEvaluator(l ledgerForEvaluator, hdr bookkeeping.BlockHeader, proto config.ConsensusParams, paysetHint int, validate bool, generate bool) (*BlockEvaluator, error) {
if hdr.Round == 0 {
return nil, ErrRoundZero
}

prevHeader, err := l.BlockHdr(hdr.Round - 1)
if err != nil {
return nil, fmt.Errorf(
"can't evaluate block %d without previous header: %v", hdr.Round, err)
}

prevProto, ok := config.Consensus[prevHeader.CurrentProtocol]
if !ok {
return nil, protocol.Error(prevHeader.CurrentProtocol)
}

base := &roundCowBase{
l: l,
// round that lookups come from is previous block. We validate
// the block at this round below, so underflow will be caught.
// If we are not validating, we must have previously checked
// an agreement.Certificate attesting that hdr is valid.
rnd: hdr.Round - 1,
txnCount: prevHeader.TxnCounter,
proto: proto,
accounts: make(map[basics.Address]basics.AccountData),
}

eval := &BlockEvaluator{
validate: validate,
generate: generate,
prevHeader: prevHeader,
block: bookkeeping.Block{BlockHeader: hdr},
proto: proto,
genesisHash: l.GenesisHash(),
Expand All @@ -412,35 +432,18 @@ func startEvaluator(l ledgerForEvaluator, hdr bookkeeping.BlockHeader, proto con
eval.block.Payset = make([]transactions.SignedTxnInBlock, 0, paysetHint)
}

prevProto := proto
base.compactCertNextRnd = eval.prevHeader.CompactCert[protocol.CompactCertBasic].CompactCertNextRound

if hdr.Round > 0 {
var err error
eval.prevHeader, err = l.BlockHdr(base.rnd)
if err != nil {
return nil, fmt.Errorf("can't evaluate block %v without previous header: %v", hdr.Round, err)
}
// Check if compact certs are being enabled as of this block.
if base.compactCertNextRnd == 0 && proto.CompactCertRounds != 0 {
// Determine the first block that will contain a Merkle
// commitment to the voters. We need to account for the
// fact that the voters come from CompactCertVotersLookback
// rounds ago.
votersRound := (hdr.Round + basics.Round(proto.CompactCertVotersLookback)).RoundUpToMultipleOf(basics.Round(proto.CompactCertRounds))

base.txnCount = eval.prevHeader.TxnCounter
base.compactCertNextRnd = eval.prevHeader.CompactCert[protocol.CompactCertBasic].CompactCertNextRound

var ok bool
prevProto, ok = config.Consensus[eval.prevHeader.CurrentProtocol]
if !ok {
return nil, protocol.Error(eval.prevHeader.CurrentProtocol)
}

// Check if compact certs are being enabled as of this block.
if base.compactCertNextRnd == 0 && proto.CompactCertRounds != 0 {
// Determine the first block that will contain a Merkle
// commitment to the voters. We need to account for the
// fact that the voters come from CompactCertVotersLookback
// rounds ago.
votersRound := (hdr.Round + basics.Round(proto.CompactCertVotersLookback)).RoundUpToMultipleOf(basics.Round(proto.CompactCertRounds))

// The first compact cert will appear CompactCertRounds after that.
base.compactCertNextRnd = votersRound + basics.Round(proto.CompactCertRounds)
}
// The first compact cert will appear CompactCertRounds after that.
base.compactCertNextRnd = votersRound + basics.Round(proto.CompactCertRounds)
}

prevTotals, err := l.Totals(eval.prevHeader.Round)
Expand Down