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
93b953fb
Commit
93b953fb
authored
Jul 19, 2017
by
Brian Guo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed instances of uint to uint256; fixes issue #226
parent
e2fdf09e
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
28 additions
and
28 deletions
+28
-28
PausableToken.sol
contracts/token/PausableToken.sol
+2
-2
TokenTimelock.sol
contracts/token/TokenTimelock.sol
+5
-5
BasicTokenMock.sol
test/helpers/BasicTokenMock.sol
+1
-1
DayLimitMock.sol
test/helpers/DayLimitMock.sol
+4
-4
ERC23TokenMock.sol
test/helpers/ERC23TokenMock.sol
+3
-3
MultisigWalletMock.sol
test/helpers/MultisigWalletMock.sol
+2
-2
PausableMock.sol
test/helpers/PausableMock.sol
+1
-1
PullPaymentMock.sol
test/helpers/PullPaymentMock.sol
+1
-1
ReentrancyMock.sol
test/helpers/ReentrancyMock.sol
+1
-1
SafeMathMock.sol
test/helpers/SafeMathMock.sol
+4
-4
ShareableMock.sol
test/helpers/ShareableMock.sol
+2
-2
StandardTokenMock.sol
test/helpers/StandardTokenMock.sol
+1
-1
VestedTokenMock.sol
test/helpers/VestedTokenMock.sol
+1
-1
No files found.
contracts/token/PausableToken.sol
View file @
93b953fb
...
...
@@ -11,11 +11,11 @@ import '../lifecycle/Pausable.sol';
contract PausableToken is StandardToken, Pausable {
function transfer(address _to, uint _value) whenNotPaused returns (bool) {
function transfer(address _to, uint
256
_value) whenNotPaused returns (bool) {
return super.transfer(_to, _value);
}
function transferFrom(address _from, address _to, uint _value) whenNotPaused returns (bool) {
function transferFrom(address _from, address _to, uint
256
_value) whenNotPaused returns (bool) {
return super.transferFrom(_from, _to, _value);
}
}
contracts/token/TokenTimelock.sol
View file @
93b953fb
...
...
@@ -5,11 +5,11 @@ import './ERC20Basic.sol';
/**
* @title TokenTimelock
* @dev TokenTimelock is a token holder contract that will allow a
* @dev TokenTimelock is a token holder contract that will allow a
* beneficiary to extract the tokens after a given release time
*/
contract TokenTimelock {
// ERC20 basic token contract being held
ERC20Basic token;
...
...
@@ -17,9 +17,9 @@ contract TokenTimelock {
address beneficiary;
// timestamp when token release is enabled
uint releaseTime;
uint
64
releaseTime;
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint _releaseTime) {
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint
64
_releaseTime) {
require(_releaseTime > now);
token = _token;
beneficiary = _beneficiary;
...
...
@@ -41,7 +41,7 @@ contract TokenTimelock {
function release() {
require(now >= releaseTime);
uint amount = token.balanceOf(this);
uint
256
amount = token.balanceOf(this);
require(amount > 0);
token.transfer(beneficiary, amount);
...
...
test/helpers/BasicTokenMock.sol
View file @
93b953fb
...
...
@@ -7,7 +7,7 @@ import '../../contracts/token/BasicToken.sol';
// mock class using BasicToken
contract BasicTokenMock is BasicToken {
function BasicTokenMock(address initialAccount, uint initialBalance) {
function BasicTokenMock(address initialAccount, uint
256
initialBalance) {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
...
...
test/helpers/DayLimitMock.sol
View file @
93b953fb
...
...
@@ -2,17 +2,17 @@ pragma solidity ^0.4.11;
import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
uint public totalSpending;
uint
256
public totalSpending;
function DayLimitMock(uint _value) DayLimit(_value) {
function DayLimitMock(uint
256
_value) DayLimit(_value) {
totalSpending = 0;
}
function attemptSpend(uint _value) external limitedDaily(_value) {
function attemptSpend(uint
256
_value) external limitedDaily(_value) {
totalSpending += _value;
}
function setDailyLimit(uint _newLimit) external {
function setDailyLimit(uint
256
_newLimit) external {
_setDailyLimit(_newLimit);
}
...
...
test/helpers/ERC23TokenMock.sol
View file @
93b953fb
...
...
@@ -5,18 +5,18 @@ import '../../contracts/token/BasicToken.sol';
contract ERC23ContractInterface {
function tokenFallback(address _from, uint _value, bytes _data) external;
function tokenFallback(address _from, uint
256
_value, bytes _data) external;
}
contract ERC23TokenMock is BasicToken {
function ERC23TokenMock(address initialAccount, uint initialBalance) {
function ERC23TokenMock(address initialAccount, uint
256
initialBalance) {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
// ERC23 compatible transfer function (except the name)
function transferERC23(address _to, uint _value, bytes _data)
function transferERC23(address _to, uint
256
_value, bytes _data)
returns (bool success)
{
transfer(_to, _value);
...
...
test/helpers/MultisigWalletMock.sol
View file @
93b953fb
...
...
@@ -2,9 +2,9 @@ pragma solidity ^0.4.11;
import "../../contracts/MultisigWallet.sol";
contract MultisigWalletMock is MultisigWallet {
uint public totalSpending;
uint
256
public totalSpending;
function MultisigWalletMock(address[] _owners, uint
_required, uint
_daylimit)
function MultisigWalletMock(address[] _owners, uint
256 _required, uint256
_daylimit)
MultisigWallet(_owners, _required, _daylimit) payable { }
function changeOwner(address _from, address _to) external { }
...
...
test/helpers/PausableMock.sol
View file @
93b953fb
...
...
@@ -7,7 +7,7 @@ import '../../contracts/lifecycle/Pausable.sol';
// mock class using Pausable
contract PausableMock is Pausable {
bool public drasticMeasureTaken;
uint public count;
uint
256
public count;
function PausableMock() {
drasticMeasureTaken = false;
...
...
test/helpers/PullPaymentMock.sol
View file @
93b953fb
...
...
@@ -10,7 +10,7 @@ contract PullPaymentMock is PullPayment {
function PullPaymentMock() payable { }
// test helper function to call asyncSend
function callSend(address dest, uint amount) {
function callSend(address dest, uint
256
amount) {
asyncSend(dest, amount);
}
...
...
test/helpers/ReentrancyMock.sol
View file @
93b953fb
...
...
@@ -15,7 +15,7 @@ contract ReentrancyMock is ReentrancyGuard {
counter += 1;
}
function countLocalRecursive(uint n) public nonReentrant {
function countLocalRecursive(uint
256
n) public nonReentrant {
if(n > 0) {
count();
countLocalRecursive(n - 1);
...
...
test/helpers/SafeMathMock.sol
View file @
93b953fb
...
...
@@ -5,17 +5,17 @@ import '../../contracts/math/SafeMath.sol';
contract SafeMathMock {
uint public result;
uint
256
public result;
function multiply(uint
a, uint
b) {
function multiply(uint
256 a, uint256
b) {
result = SafeMath.mul(a, b);
}
function subtract(uint
a, uint
b) {
function subtract(uint
256 a, uint256
b) {
result = SafeMath.sub(a, b);
}
function add(uint
a, uint
b) {
function add(uint
256 a, uint256
b) {
result = SafeMath.add(a, b);
}
}
test/helpers/ShareableMock.sol
View file @
93b953fb
...
...
@@ -3,9 +3,9 @@ import "../../contracts/ownership/Shareable.sol";
contract ShareableMock is Shareable {
uint public count = 0;
uint
256
public count = 0;
function ShareableMock(address[] _owners, uint _required) Shareable(_owners, _required) {
function ShareableMock(address[] _owners, uint
256
_required) Shareable(_owners, _required) {
}
...
...
test/helpers/StandardTokenMock.sol
View file @
93b953fb
...
...
@@ -7,7 +7,7 @@ import '../../contracts/token/StandardToken.sol';
// mock class using StandardToken
contract StandardTokenMock is StandardToken {
function StandardTokenMock(address initialAccount, uint initialBalance) {
function StandardTokenMock(address initialAccount, uint
256
initialBalance) {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
...
...
test/helpers/VestedTokenMock.sol
View file @
93b953fb
...
...
@@ -4,7 +4,7 @@ import '../../contracts/token/VestedToken.sol';
// mock class using StandardToken
contract VestedTokenMock is VestedToken {
function VestedTokenMock(address initialAccount, uint initialBalance) {
function VestedTokenMock(address initialAccount, uint
256
initialBalance) {
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
}
...
...
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