diff --git a/mysticeti.nim b/mysticeti.nim index 28be920..4da4b10 100644 --- a/mysticeti.nim +++ b/mysticeti.nim @@ -14,7 +14,7 @@ export validator.primaryProposer export validator.nextRound export validator.parentBlocks export validator.check -export validator.receive +export validator.add export validator.getBlock export validator.status export validator.committed diff --git a/mysticeti/validator.nim b/mysticeti/validator.nim index bca8b80..f18cc95 100644 --- a/mysticeti/validator.nim +++ b/mysticeti/validator.nim @@ -126,7 +126,7 @@ func check*(validator: Validator, signed: SignedBlock): auto = return BlockCheck.invalid("block already received") BlockCheck.correct(signed) -func receive*(validator: Validator, correct: CorrectBlock) = +func add*(validator: Validator, correct: CorrectBlock) = validator.addBlock(correct.signedBlock) func getBlock*(validator: Validator, id: BlockId): auto = diff --git a/tests/mysticeti/simulator.nim b/tests/mysticeti/simulator.nim index 5d53bb8..4c49dfd 100644 --- a/tests/mysticeti/simulator.nim +++ b/tests/mysticeti/simulator.nim @@ -41,7 +41,7 @@ proc propose*(simulator: NetworkSimulator, validatorIndex: int): SignedBlock = let signature = identity.sign(blck.id.hash) let signed = SignedBlock.init(blck, signature) let checked = validator.check(signed) - validator.receive(checked.blck) + validator.add(checked.blck) signed proc propose*(simulator: NetworkSimulator): seq[SignedBlock] = @@ -61,7 +61,7 @@ proc exchangeBlock*(proposer, receiver: Validator, blck: SignedBlock): ?!void = checked = receiver.check(blck) # send proposal if checked.verdict == BlockVerdict.correct: - receiver.receive(checked.blck) + receiver.add(checked.blck) success() proc exchangeProposals*(simulator: NetworkSimulator, exchanges: openArray[(int, seq[int])]): ?!seq[SignedBlock] = diff --git a/tests/mysticeti/validator/testValidatorNetwork.nim b/tests/mysticeti/validator/testValidatorNetwork.nim index 9ebb54f..bf29ddb 100644 --- a/tests/mysticeti/validator/testValidatorNetwork.nim +++ b/tests/mysticeti/validator/testValidatorNetwork.nim @@ -51,7 +51,7 @@ suite "Validator Network": let round = proposal.blck.round let author = proposal.blck.author 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 test "refuses proposals that are not signed by the author": @@ -186,10 +186,10 @@ suite "Validator Network": # second round: voting simulator.nextRound() let votes = simulator.propose() - simulator.validators[0].receive(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[1]).blck) + simulator.validators[0].add(simulator.validators[0].check(votes[2]).blck) 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 test "skips blocks that are ignored by blocks that are received later": @@ -230,9 +230,9 @@ suite "Validator Network": # third round: certifying simulator.nextRound() 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 - 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 test "commits blocks that are certified by blocks that are received later":