pull/334/head
Trevor Porter 3 years ago
parent d7449fa2cf
commit 554fca9ee6
  1. 26
      solidity/core/test/validator-manager/inboxMultisigValidatorManager.test.ts
  2. 19
      solidity/core/test/validator-manager/outboxMultisigValidatorManager.test.ts

@ -25,11 +25,7 @@ describe.only('InboxMultisigValidatorManager', () => {
before(async () => { before(async () => {
const signers = await ethers.getSigners(); const signers = await ethers.getSigners();
[signer] = signers; [signer] = signers;
const [ const [, validatorSigner0, validatorSigner1] = signers;
,
validatorSigner0,
validatorSigner1,
] = signers;
validator0 = await Validator.fromSigner(validatorSigner0, OUTBOX_DOMAIN); validator0 = await Validator.fromSigner(validatorSigner0, OUTBOX_DOMAIN);
validator1 = await Validator.fromSigner(validatorSigner1, OUTBOX_DOMAIN); validator1 = await Validator.fromSigner(validatorSigner1, OUTBOX_DOMAIN);
}); });
@ -65,16 +61,9 @@ describe.only('InboxMultisigValidatorManager', () => {
[validator0, validator1], // 2/2 signers, making a quorum [validator0, validator1], // 2/2 signers, making a quorum
); );
await validatorManager.checkpoint( await validatorManager.checkpoint(inbox.address, root, index, signatures);
inbox.address,
root, expect(await inbox.checkpoints(root)).to.equal(index);
index,
signatures,
);
expect(
await inbox.checkpoints(root)
).to.equal(index);
}); });
it('reverts if there is not a quorum', async () => { it('reverts if there is not a quorum', async () => {
@ -85,12 +74,7 @@ describe.only('InboxMultisigValidatorManager', () => {
); );
await expect( await expect(
validatorManager.checkpoint( validatorManager.checkpoint(inbox.address, root, index, signatures),
inbox.address,
root,
index,
signatures,
)
).to.be.revertedWith('!quorum'); ).to.be.revertedWith('!quorum');
}); });
}); });

@ -66,12 +66,7 @@ describe('OutboxMultisigValidatorManager', () => {
), ),
) )
.to.emit(validatorManager, 'ImproperCheckpoint') .to.emit(validatorManager, 'ImproperCheckpoint')
.withArgs( .withArgs(outbox.address, root, index, signatures);
outbox.address,
root,
index,
signatures,
);
expect(await outbox.state()).to.equal(types.AbacusState.FAILED); expect(await outbox.state()).to.equal(types.AbacusState.FAILED);
}); });
@ -81,14 +76,14 @@ describe('OutboxMultisigValidatorManager', () => {
index, index,
[validator0], // 1/2 signers is not a quorum [validator0], // 1/2 signers is not a quorum
); );
await expect( await expect(
validatorManager.improperCheckpoint( validatorManager.improperCheckpoint(
outbox.address, outbox.address,
root, root,
index, index,
signatures signatures,
) ),
).to.be.revertedWith('!quorum'); ).to.be.revertedWith('!quorum');
}); });
@ -107,14 +102,14 @@ describe('OutboxMultisigValidatorManager', () => {
index.toNumber(), index.toNumber(),
[validator0, validator1], // 2/2 signers, making a quorum [validator0, validator1], // 2/2 signers, making a quorum
); );
await expect( await expect(
validatorManager.improperCheckpoint( validatorManager.improperCheckpoint(
outbox.address, outbox.address,
root, root,
index, index,
signatures signatures,
) ),
).to.be.revertedWith('!improper'); ).to.be.revertedWith('!improper');
}); });
}); });

Loading…
Cancel
Save