Skip to content

Role Integration Testing #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Jul 25, 2022
Merged

Role Integration Testing #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
de4e144
Role Integration Testing
ElliotFriedman Jul 22, 2022
2288100
update integration test run script, remove gas coverage integration t…
ElliotFriedman Jul 22, 2022
bf478f0
add setup function to role test
ElliotFriedman Jul 22, 2022
e3d8333
remove console log and add setup function to arbitrum tests
ElliotFriedman Jul 22, 2022
36f96cc
fix integration tests
ElliotFriedman Jul 22, 2022
bd5c5be
remove arbitrum tests
ElliotFriedman Jul 22, 2022
2e7d12e
remove arbitrum role test
ElliotFriedman Jul 22, 2022
b4500fa
Merge branch 'develop' of github.com:volt-protocol/volt-protocol-core…
ElliotFriedman Jul 23, 2022
bba4705
Add Arbitrum addresses, remove deprecated integration tests
ElliotFriedman Jul 23, 2022
f3ca83f
Merge branch 'chore/fix-failing-it' of github.com:volt-protocol/volt-…
ElliotFriedman Jul 23, 2022
ca82d1a
Arbitrum Role Integration Testing
ElliotFriedman Jul 23, 2022
52b8307
remove deprecated volt system integration test
ElliotFriedman Jul 23, 2022
492d74a
update test structure
ElliotFriedman Jul 23, 2022
e58027b
fix merge conflicts
ElliotFriedman Jul 23, 2022
2665eb2
Create k-array tree to test role hierarchy
ElliotFriedman Jul 25, 2022
47856b2
Add method to set role of a node, add test for mainnet roles
ElliotFriedman Jul 25, 2022
cd54c29
forge install: forge-std
ElliotFriedman Jul 25, 2022
f58c1a7
add solidity 0.8.13 to hardhat config file
ElliotFriedman Jul 25, 2022
bae82e7
Fix unit tests and KArray tree class
ElliotFriedman Jul 25, 2022
11aba98
add exists function, add additional test coverage to KArray tree
ElliotFriedman Jul 25, 2022
fd46526
add tests for free, delete the whole array in free
ElliotFriedman Jul 25, 2022
4173e4d
simplify insert method
ElliotFriedman Jul 25, 2022
427c4a5
revert back to DSTest to fix hardhat build issue
ElliotFriedman Jul 25, 2022
aa0de5b
Remove deprecated contracts and roles
ElliotFriedman Jul 25, 2022
dd724e3
all integration tests complete
ElliotFriedman Jul 25, 2022
d72c47b
remove unused IERC20, VOLT and VCON imports
ElliotFriedman Jul 25, 2022
a0ae839
remove forge-std
ElliotFriedman Jul 25, 2022
dcec4f0
move state variables into RoleConfig contracts
ElliotFriedman Jul 25, 2022
7e349ea
additional cleanup
ElliotFriedman Jul 25, 2022
ac762c7
update naming for PCV Guardian in address file
ElliotFriedman Jul 25, 2022
cacd156
update to PCV_GUARDIAN in arbitrum addresses
ElliotFriedman Jul 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
name: Run tests
command: |
source /home/circleci/.bashrc
export PATH=$PATH:/home/circleci/.foundry/bin; npm run clean && npm run compile && npm run test && npm run test:integration
export PATH=$PATH:/home/circleci/.foundry/bin; npm run clean && npm run compile && npm run test && npm run test:integration && npm run test:integration:arbitrum

workflows:
main:
Expand Down
10 changes: 0 additions & 10 deletions contracts/core/TribeRoles.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ library TribeRoles {
Admin Roles
//////////////////////////////////////////////////////////////*/

/// @notice can manage the majority of Tribe protocol parameters. Sets boundaries for MINOR_PARAM_ROLE.
bytes32 internal constant PARAMETER_ADMIN = keccak256("PARAMETER_ADMIN");

/// @notice admin of PCVGuardian
bytes32 internal constant PCV_GUARDIAN_ADMIN =
keccak256("PCV_GUARDIAN_ADMIN_ROLE");

/// @notice manages the granting and revocation of PCV Guard roles
bytes32 internal constant PCV_GUARD_ADMIN =
keccak256("PCV_GUARD_ADMIN_ROLE");
Expand All @@ -48,9 +41,6 @@ library TribeRoles {
Minor Roles
//////////////////////////////////////////////////////////////*/

/// @notice capable of adding an address to multi rate limited
bytes32 internal constant ADD_MINTER_ROLE = keccak256("ADD_MINTER_ROLE");

/// @notice capable of changing PCV Deposit and Global Rate Limited Minter in the PSM
bytes32 internal constant PSM_ADMIN_ROLE = keccak256("PSM_ADMIN_ROLE");
}
20 changes: 0 additions & 20 deletions contracts/mock/MockMinter.sol
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions contracts/peg/INonCustodialPSM.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pragma solidity ^0.8.4;

import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import {IPCVDeposit} from "../pcv/IPCVDeposit.sol";
import {GlobalRateLimitedMinter} from "../utils/GlobalRateLimitedMinter.sol";
import {IGlobalRateLimitedMinter} from "../utils/IGlobalRateLimitedMinter.sol";

/**
* @title Fei Peg Stability Module
Expand Down Expand Up @@ -50,7 +50,7 @@ interface INonCustodialPSM {
function setPCVDeposit(IPCVDeposit newTarget) external;

/// @notice set the target to call for FEI minting
function setGlobalRateLimitedMinter(GlobalRateLimitedMinter newMinter)
function setGlobalRateLimitedMinter(IGlobalRateLimitedMinter newMinter)
external;

/// @notice withdraw ERC20 from the contract
Expand Down Expand Up @@ -93,7 +93,7 @@ interface INonCustodialPSM {
function rateLimitedMinter()
external
view
returns (GlobalRateLimitedMinter);
returns (IGlobalRateLimitedMinter);

/// @notice the max mint and redeem fee in basis points
function MAX_FEE() external view returns (uint256);
Expand Down Expand Up @@ -134,8 +134,8 @@ interface INonCustodialPSM {

/// @notice event emitted when global rate limited minter is updated
event GlobalRateLimitedMinterUpdate(
GlobalRateLimitedMinter oldMinter,
GlobalRateLimitedMinter newMinter
IGlobalRateLimitedMinter oldMinter,
IGlobalRateLimitedMinter newMinter
);

/// @notice event that is emitted when redemptions are paused
Expand Down
Loading