NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add state getter in TimelockController using OperationState enum (#4358)

Browse Source 
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
This commit is contained in:
Renan Souza
2023-07-04 15:23:44 -03:00
committed by GitHub
parent 6e21422737
commit e3adf91e50
6 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/governance/TimelockController.test.js
View File

@ -1,5 +1,6 @@
const { BN, constants, expectEvent, expectRevert, time } = require('@openzeppelin/test-helpers');
const { ZERO_ADDRESS, ZERO_BYTES32 } = constants;
const { proposalStatesToBitMap } = require('../helpers/governance');
const { expect } = require('chai');
@ -195,7 +196,7 @@ contract('TimelockController', function (accounts) {
{ from: proposer },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Unset],
[this.operation.id, proposalStatesToBitMap(OperationState.Unset)],
);
});
@ -267,7 +268,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -295,7 +296,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -313,7 +314,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -408,7 +409,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[reentrantOperation.id, OperationState.Ready],
[reentrantOperation.id, proposalStatesToBitMap(OperationState.Ready)],
);
// Disable reentrancy
@ -505,7 +506,7 @@ contract('TimelockController', function (accounts) {
{ from: proposer },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Unset],
[this.operation.id, proposalStatesToBitMap(OperationState.Unset)],
);
});
@ -596,7 +597,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -624,7 +625,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -642,7 +643,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[this.operation.id, OperationState.Ready],
[this.operation.id, proposalStatesToBitMap(OperationState.Ready)],
);
});
@ -784,7 +785,7 @@ contract('TimelockController', function (accounts) {
{ from: executor },
),
'TimelockUnexpectedOperationState',
[reentrantBatchOperation.id, OperationState.Ready],
[reentrantBatchOperation.id, proposalStatesToBitMap(OperationState.Ready)],
);
// Disable reentrancy
@ -881,7 +882,7 @@ contract('TimelockController', function (accounts) {
await expectRevertCustomError(
this.mock.cancel(constants.ZERO_BYTES32, { from: canceller }),
'TimelockUnexpectedOperationState',
[constants.ZERO_BYTES32, OperationState.Pending],
[constants.ZERO_BYTES32, proposalStatesToBitMap([OperationState.Waiting, OperationState.Ready])],
);
});