rename: validator.receive() -> validator.add()

This commit is contained in:
Mark Spanbroek 2024-12-09 16:49:44 +01:00
parent 416d43bed1
commit aa4f390a1a
4 changed files with 10 additions and 10 deletions

View File

@ -14,7 +14,7 @@ export validator.primaryProposer
export validator.nextRound export validator.nextRound
export validator.parentBlocks export validator.parentBlocks
export validator.check export validator.check
export validator.receive export validator.add
export validator.getBlock export validator.getBlock
export validator.status export validator.status
export validator.committed export validator.committed

View File

@ -126,7 +126,7 @@ func check*(validator: Validator, signed: SignedBlock): auto =
return BlockCheck.invalid("block already received") return BlockCheck.invalid("block already received")
BlockCheck.correct(signed) BlockCheck.correct(signed)
func receive*(validator: Validator, correct: CorrectBlock) = func add*(validator: Validator, correct: CorrectBlock) =
validator.addBlock(correct.signedBlock) validator.addBlock(correct.signedBlock)
func getBlock*(validator: Validator, id: BlockId): auto = func getBlock*(validator: Validator, id: BlockId): auto =

View File

@ -41,7 +41,7 @@ proc propose*(simulator: NetworkSimulator, validatorIndex: int): SignedBlock =
let signature = identity.sign(blck.id.hash) let signature = identity.sign(blck.id.hash)
let signed = SignedBlock.init(blck, signature) let signed = SignedBlock.init(blck, signature)
let checked = validator.check(signed) let checked = validator.check(signed)
validator.receive(checked.blck) validator.add(checked.blck)
signed signed
proc propose*(simulator: NetworkSimulator): seq[SignedBlock] = proc propose*(simulator: NetworkSimulator): seq[SignedBlock] =
@ -61,7 +61,7 @@ proc exchangeBlock*(proposer, receiver: Validator, blck: SignedBlock): ?!void =
checked = receiver.check(blck) checked = receiver.check(blck)
# send proposal # send proposal
if checked.verdict == BlockVerdict.correct: if checked.verdict == BlockVerdict.correct:
receiver.receive(checked.blck) receiver.add(checked.blck)
success() success()
proc exchangeProposals*(simulator: NetworkSimulator, exchanges: openArray[(int, seq[int])]): ?!seq[SignedBlock] = proc exchangeProposals*(simulator: NetworkSimulator, exchanges: openArray[(int, seq[int])]): ?!seq[SignedBlock] =

View File

@ -51,7 +51,7 @@ suite "Validator Network":
let round = proposal.blck.round let round = proposal.blck.round
let author = proposal.blck.author let author = proposal.blck.author
let checked = simulator.validators[0].check(proposal) let checked = simulator.validators[0].check(proposal)
simulator.validators[0].receive(checked.blck) simulator.validators[0].add(checked.blck)
check simulator.validators[0].status(round, author) == some SlotStatus.undecided check simulator.validators[0].status(round, author) == some SlotStatus.undecided
test "refuses proposals that are not signed by the author": test "refuses proposals that are not signed by the author":
@ -186,10 +186,10 @@ suite "Validator Network":
# second round: voting # second round: voting
simulator.nextRound() simulator.nextRound()
let votes = simulator.propose() let votes = simulator.propose()
simulator.validators[0].receive(simulator.validators[0].check(votes[1]).blck) simulator.validators[0].add(simulator.validators[0].check(votes[1]).blck)
simulator.validators[0].receive(simulator.validators[0].check(votes[2]).blck) simulator.validators[0].add(simulator.validators[0].check(votes[2]).blck)
check simulator.validators[0].status(round, author) == some SlotStatus.undecided check simulator.validators[0].status(round, author) == some SlotStatus.undecided
simulator.validators[0].receive(simulator.validators[0].check(votes[3]).blck) simulator.validators[0].add(simulator.validators[0].check(votes[3]).blck)
check simulator.validators[0].status(round, author) == some SlotStatus.skip check simulator.validators[0].status(round, author) == some SlotStatus.skip
test "skips blocks that are ignored by blocks that are received later": test "skips blocks that are ignored by blocks that are received later":
@ -230,9 +230,9 @@ suite "Validator Network":
# third round: certifying # third round: certifying
simulator.nextRound() simulator.nextRound()
let certificates = simulator.propose() let certificates = simulator.propose()
simulator.validators[0].receive(simulator.validators[0].check(certificates[1]).blck) simulator.validators[0].add(simulator.validators[0].check(certificates[1]).blck)
check simulator.validators[0].status(round, author) == some SlotStatus.undecided check simulator.validators[0].status(round, author) == some SlotStatus.undecided
simulator.validators[0].receive(simulator.validators[0].check(certificates[2]).blck) simulator.validators[0].add(simulator.validators[0].check(certificates[2]).blck)
check simulator.validators[0].status(round, author) == some SlotStatus.commit check simulator.validators[0].status(round, author) == some SlotStatus.commit
test "commits blocks that are certified by blocks that are received later": test "commits blocks that are certified by blocks that are received later":