Skip to content

Improve encapsulation on ERC165 and update code style guide #1379

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
nventuro merged 3 commits into from
Oct 12, 2018
+5 −4
Merged

Improve encapsulation on ERC165 and update code style guide #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a00f026
use prefix underscore for internal state variables
ZumZoom Oct 4, 2018
f005bb5
make _supportedInterfaces private
ZumZoom Oct 7, 2018
0ef3d26
Merge branch 'master' into fix/internal-underscore
nventuro Oct 12, 2018
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 CODE_STYLE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Any exception or additions specific to our project are documented below.
```
contract TestContract {
uint256 private _privateVar;
uint256 internal _internalVar;
}
```

Expand Down
2 changes: 1 addition & 1 deletion contracts/introspection/ERC165.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ contract ERC165 is IERC165 {
/**
* @dev a mapping of interface id to whether or not it's supported
*/
mapping(bytes4 => bool) internal _supportedInterfaces;
mapping(bytes4 => bool) private _supportedInterfaces;

/**
* @dev A contract implementing SupportsInterfaceWithLookup
Expand Down
6 changes: 3 additions & 3 deletions contracts/mocks/ERC165/ERC165InterfacesSupported.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ contract SupportsInterfaceWithLookupMock is IERC165 {
/**
* @dev a mapping of interface id to whether or not it's supported
*/
mapping(bytes4 => bool) internal supportedInterfaces;
mapping(bytes4 => bool) private _supportedInterfaces;

/**
* @dev A contract implementing SupportsInterfaceWithLookup
Expand All @@ -41,7 +41,7 @@ contract SupportsInterfaceWithLookupMock is IERC165 {
view
returns (bool)
{
return supportedInterfaces[interfaceId];
return _supportedInterfaces[interfaceId];
}

/**
Expand All @@ -51,7 +51,7 @@ contract SupportsInterfaceWithLookupMock is IERC165 {
internal
{
require(interfaceId != 0xffffffff);
supportedInterfaces[interfaceId] = true;
_supportedInterfaces[interfaceId] = true;
}
}

Expand Down