Skip to content

Commit

Permalink
Clean up after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
kronosapiens committed Mar 12, 2024
1 parent 1021012 commit a18fd97
Show file tree
Hide file tree
Showing 9 changed files with 37,956 additions and 21,966 deletions.
6 changes: 2 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ step_setup_global_packages: &step_setup_global_packages
name: "Set up global packages"
command: |
npm set cache ~/.npm
sudo npm install -g npm@8.1.4
sudo npm install -g npm@8.5.5
npm ci
git submodule update --init
step_pull_solc_docker: &step_pull_solc_docker
Expand Down Expand Up @@ -404,9 +404,7 @@ jobs:
- <<: *step_setup_slither
- run:
name: "Slither analysis"
command: |
rm build/contracts/*
npm run test:security:slither
command: npm run test:security:slither
end-to-end-tests:
<<: *job_common
steps:
Expand Down
2 changes: 1 addition & 1 deletion contracts/colony/IColony.sol
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ interface IColony is ColonyDataTypes, IRecovery, IBasicMetaTransaction, IMultica
/// @param _id Expenditure identifier
function finalizeExpenditure(uint256 _id) external;

/// @notice Finalizes the expenditure and allows for funds to be claimed. Can only be called by expenditure owner.
/// @notice Finalizes the expenditure and allows for funds to be claimed. Can only be called by Arbitration role.
/// @param _permissionDomainId The domainId in which I have the permission to take this action
/// @param _childSkillIndex The index that the `_domainId` is relative to `_permissionDomainId`,
/// @param _id Expenditure identifier
Expand Down
2 changes: 1 addition & 1 deletion docs/interfaces/icolony.md
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ Finalizes the expenditure and allows for funds to be claimed. Can only be called

### `finalizeExpenditureViaArbitration(uint256 _permissionDomainId, uint256 _childSkillIndex, uint256 _id)`

Finalizes the expenditure and allows for funds to be claimed. Can only be called by expenditure owner.
Finalizes the expenditure and allows for funds to be claimed. Can only be called by Arbitration role.


**Parameters**
Expand Down
Loading

0 comments on commit a18fd97

Please sign in to comment.