소스 검색

added explicit visibility (#1261)

Vyom Sharma 7 년 전
부모
커밋
4385fd5a23
5개의 변경된 파일16개의 추가작업 그리고 15개의 파일을 삭제
  1. 1 0
      README.md
  2. 2 2
      contracts/access/SignatureBouncer.sol
  3. 2 2
      contracts/mocks/ERC721ReceiverMock.sol
  4. 1 1
      contracts/mocks/RBACMock.sol
  5. 10 10
      contracts/mocks/SafeERC20Helper.sol

+ 1 - 0
README.md

@@ -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

+ 2 - 2
contracts/access/SignatureBouncer.sol

@@ -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

+ 2 - 2
contracts/mocks/ERC721ReceiverMock.sol

@@ -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,

+ 1 - 1
contracts/mocks/RBACMock.sol

@@ -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()
   {

+ 10 - 10
contracts/mocks/SafeERC20Helper.sol

@@ -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);
   }
 }