Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
5eafd1de
Commit
5eafd1de
authored
Jan 21, 2019
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix remaining tests in standalone contracts
parent
f8427843
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
Pausable.sol
contracts/lifecycle/Pausable.sol
+2
-0
StandaloneERC20.sol
contracts/token/ERC20/StandaloneERC20.sol
+2
-2
StandaloneERC20.test.js
test/token/ERC20/StandaloneERC20.test.js
+1
-1
No files found.
contracts/lifecycle/Pausable.sol
View file @
5eafd1de
...
@@ -14,6 +14,8 @@ contract Pausable is Initializable, PauserRole {
...
@@ -14,6 +14,8 @@ contract Pausable is Initializable, PauserRole {
bool private _paused;
bool private _paused;
function initialize(address sender) public initializer {
function initialize(address sender) public initializer {
PauserRole._initialize(sender);
_paused = false;
_paused = false;
}
}
...
...
contracts/token/ERC20/StandaloneERC20.sol
View file @
5eafd1de
...
@@ -44,10 +44,10 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
...
@@ -44,10 +44,10 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
ERC20Detailed.initialize(name, symbol, decimals);
ERC20Detailed.initialize(name, symbol, decimals);
// Initialize the minter and pauser roles, and renounce them
// Initialize the minter and pauser roles, and renounce them
ERC20Mintable.initialize(
address(this)
);
ERC20Mintable.initialize(
msg.sender
);
renounceMinter();
renounceMinter();
ERC20Pausable.initialize(
address(this)
);
ERC20Pausable.initialize(
msg.sender
);
renouncePauser();
renouncePauser();
// Add the requested minters and pausers (this can be done after renouncing since
// Add the requested minters and pausers (this can be done after renouncing since
...
...
test/token/ERC20/StandaloneERC20.test.js
View file @
5eafd1de
const
encodeCall
=
require
(
'zos-lib/lib/helpers/encodeCall'
).
default
;
const
encodeCall
=
require
(
'zos-lib/lib/helpers/encodeCall'
).
default
;
const
{
shouldBehaveLikeERC20Mintable
}
=
require
(
'./behaviors/ERC20Mintable.behavior'
);
const
{
shouldBehaveLikeERC20Mintable
}
=
require
(
'./behaviors/ERC20Mintable.behavior'
);
const
{
shouldFail
}
=
require
(
'../../helpers/shouldFail'
);
const
shouldFail
=
require
(
'../../helpers/shouldFail'
);
const
BigNumber
=
web3
.
BigNumber
;
const
BigNumber
=
web3
.
BigNumber
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment