From 3ed1f0a86d64073bb6dbf136ef3e3fd053cac10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=9Fingen?= Date: Fri, 31 Jul 2020 13:34:40 +0200 Subject: [PATCH 1/2] disputable: Add tests to check role constants --- .../contracts/apps/disputable/disputable_app.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/contracts/apps/disputable/disputable_app.js b/test/contracts/apps/disputable/disputable_app.js index 841da1e14..5d9f4321c 100644 --- a/test/contracts/apps/disputable/disputable_app.js +++ b/test/contracts/apps/disputable/disputable_app.js @@ -1,3 +1,4 @@ +const { keccak_256 } = require('js-sha3') const { assertRevert } = require('../../../helpers/assertThrow') const { getEventArgument } = require('../../../helpers/events') const { getNewProxyAddress } = require('../../../helpers/events') @@ -322,4 +323,20 @@ contract('DisputableApp', ([_, owner, agreement, anotherAgreement, someone]) => }) }) }) + + describe('roles', () => { + const COMPUTED_CHALLENGE_ROLE = '0x' + keccak_256("CHALLENGE_ROLE") + const COMPUTED_SET_AGREEMENT_ROLE = '0x' + keccak_256("SET_AGREEMENT_ROLE") + + let CHALLENGE_ROLE, SET_AGREEMENT_ROLE + + before('load role', async () => { + CHALLENGE_ROLE = await disputableBase.CHALLENGE_ROLE() + SET_AGREEMENT_ROLE = await disputableBase.SET_AGREEMENT_ROLE() + }) + it('roles match', async () => { + assert.equal(CHALLENGE_ROLE, COMPUTED_CHALLENGE_ROLE, 'CHALLENGE_ROLE doesn’t match') + assert.equal(SET_AGREEMENT_ROLE, COMPUTED_SET_AGREEMENT_ROLE, 'SET_AGREEMENT_ROLE doesn’t match') + }) + }) }) From fc35c9a22391745169bd6b7c89fa30ce4a9bfd99 Mon Sep 17 00:00:00 2001 From: Facu Spagnuolo Date: Sat, 1 Aug 2020 09:23:54 -0300 Subject: [PATCH 2/2] Disputable: Polish roles tests --- .../apps/disputable/disputable_app.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/test/contracts/apps/disputable/disputable_app.js b/test/contracts/apps/disputable/disputable_app.js index 5d9f4321c..c663704e3 100644 --- a/test/contracts/apps/disputable/disputable_app.js +++ b/test/contracts/apps/disputable/disputable_app.js @@ -1,4 +1,4 @@ -const { keccak_256 } = require('js-sha3') +const { sha3 } = require('web3-utils') const { assertRevert } = require('../../../helpers/assertThrow') const { getEventArgument } = require('../../../helpers/events') const { getNewProxyAddress } = require('../../../helpers/events') @@ -325,18 +325,12 @@ contract('DisputableApp', ([_, owner, agreement, anotherAgreement, someone]) => }) describe('roles', () => { - const COMPUTED_CHALLENGE_ROLE = '0x' + keccak_256("CHALLENGE_ROLE") - const COMPUTED_SET_AGREEMENT_ROLE = '0x' + keccak_256("SET_AGREEMENT_ROLE") + it('computes roles properly', async () => { + const EXPECTED_CHALLENGE_ROLE = sha3('CHALLENGE_ROLE') + assert.equal(await disputableBase.CHALLENGE_ROLE(), EXPECTED_CHALLENGE_ROLE, 'CHALLENGE_ROLE doesn’t match') - let CHALLENGE_ROLE, SET_AGREEMENT_ROLE - - before('load role', async () => { - CHALLENGE_ROLE = await disputableBase.CHALLENGE_ROLE() - SET_AGREEMENT_ROLE = await disputableBase.SET_AGREEMENT_ROLE() - }) - it('roles match', async () => { - assert.equal(CHALLENGE_ROLE, COMPUTED_CHALLENGE_ROLE, 'CHALLENGE_ROLE doesn’t match') - assert.equal(SET_AGREEMENT_ROLE, COMPUTED_SET_AGREEMENT_ROLE, 'SET_AGREEMENT_ROLE doesn’t match') + const EXPECTED_SET_AGREEMENT_ROLE = sha3('SET_AGREEMENT_ROLE') + assert.equal(await disputableBase.SET_AGREEMENT_ROLE(), EXPECTED_SET_AGREEMENT_ROLE, 'SET_AGREEMENT_ROLE doesn’t match') }) }) })