Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ Interested in contributing to OpenZeppelin?
- Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
- Issue tracker: https://github.com/OpenZeppelin/openzeppelin-solidity/issues
- Contribution guidelines: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md
- Code-style guide: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CODE_STYLE.md
- Wiki: https://github.com/OpenZeppelin/openzeppelin-solidity/wiki

## License
Expand Down
4 changes: 2 additions & 2 deletions contracts/access/SignatureBouncer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ contract SignatureBouncer is Ownable, RBAC {
using ECRecovery for bytes32;

string public constant ROLE_BOUNCER = "bouncer";
uint constant METHOD_ID_SIZE = 4;
uint internal constant METHOD_ID_SIZE = 4;
// signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
uint constant SIGNATURE_SIZE = 96;
uint internal constant SIGNATURE_SIZE = 96;

/**
* @dev requires that a valid signature of a bouncer was provided
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/ERC721ReceiverMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import "../token/ERC721/IERC721Receiver.sol";


contract ERC721ReceiverMock is IERC721Receiver {
bytes4 retval_;
bool reverts_;
bytes4 internal retval_;
bool internal reverts_;

event Received(
address _operator,
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/RBACMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "../examples/RBACWithAdmin.sol";

contract RBACMock is RBACWithAdmin {

string constant ROLE_ADVISOR = "advisor";
string internal constant ROLE_ADVISOR = "advisor";

modifier onlyAdminOrAdvisor()
{
Expand Down
20 changes: 10 additions & 10 deletions contracts/mocks/SafeERC20Helper.sol
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,35 @@ contract ERC20SucceedingMock is IERC20 {
contract SafeERC20Helper {
using SafeERC20 for IERC20;

IERC20 failing;
IERC20 succeeding;
IERC20 internal failing_;
IERC20 internal succeeding_;

constructor() public {
failing = new ERC20FailingMock();
succeeding = new ERC20SucceedingMock();
failing_ = new ERC20FailingMock();
succeeding_ = new ERC20SucceedingMock();
}

function doFailingTransfer() public {
failing.safeTransfer(address(0), 0);
failing_.safeTransfer(address(0), 0);
}

function doFailingTransferFrom() public {
failing.safeTransferFrom(address(0), address(0), 0);
failing_.safeTransferFrom(address(0), address(0), 0);
}

function doFailingApprove() public {
failing.safeApprove(address(0), 0);
failing_.safeApprove(address(0), 0);
}

function doSucceedingTransfer() public {
succeeding.safeTransfer(address(0), 0);
succeeding_.safeTransfer(address(0), 0);
}

function doSucceedingTransferFrom() public {
succeeding.safeTransferFrom(address(0), address(0), 0);
succeeding_.safeTransferFrom(address(0), address(0), 0);
}

function doSucceedingApprove() public {
succeeding.safeApprove(address(0), 0);
succeeding_.safeApprove(address(0), 0);
}
}