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
c6e0edb2
Commit
c6e0edb2
authored
Nov 23, 2017
by
Alejandro Santander
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove solidity warnings in tests
parent
b5039186
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
44 additions
and
44 deletions
+44
-44
BasicTokenMock.sol
test/helpers/BasicTokenMock.sol
+1
-1
BurnableTokenMock.sol
test/helpers/BurnableTokenMock.sol
+1
-1
CappedCrowdsaleImpl.sol
test/helpers/CappedCrowdsaleImpl.sol
+1
-1
DayLimitMock.sol
test/helpers/DayLimitMock.sol
+1
-1
DetailedERC20Mock.sol
test/helpers/DetailedERC20Mock.sol
+1
-1
ERC23TokenMock.sol
test/helpers/ERC23TokenMock.sol
+2
-2
FinalizableCrowdsaleImpl.sol
test/helpers/FinalizableCrowdsaleImpl.sol
+1
-1
ForceEther.sol
test/helpers/ForceEther.sol
+2
-2
HasNoEtherTest.sol
test/helpers/HasNoEtherTest.sol
+1
-1
InsecureTargetBounty.sol
test/helpers/InsecureTargetBounty.sol
+1
-1
LimitBalanceMock.sol
test/helpers/LimitBalanceMock.sol
+1
-1
PausableMock.sol
test/helpers/PausableMock.sol
+1
-1
PausableTokenMock.sol
test/helpers/PausableTokenMock.sol
+1
-1
PullPaymentMock.sol
test/helpers/PullPaymentMock.sol
+2
-2
ReentrancyAttack.sol
test/helpers/ReentrancyAttack.sol
+1
-1
ReentrancyMock.sol
test/helpers/ReentrancyMock.sol
+1
-1
RefundableCrowdsaleImpl.sol
test/helpers/RefundableCrowdsaleImpl.sol
+1
-1
SafeERC20Helper.sol
test/helpers/SafeERC20Helper.sol
+17
-17
SafeMathMock.sol
test/helpers/SafeMathMock.sol
+3
-3
SecureTargetBounty.sol
test/helpers/SecureTargetBounty.sol
+1
-1
SplitPaymentMock.sol
test/helpers/SplitPaymentMock.sol
+2
-2
StandardTokenMock.sol
test/helpers/StandardTokenMock.sol
+1
-1
No files found.
test/helpers/BasicTokenMock.sol
View file @
c6e0edb2
...
@@ -7,7 +7,7 @@ import '../../contracts/token/BasicToken.sol';
...
@@ -7,7 +7,7 @@ import '../../contracts/token/BasicToken.sol';
// mock class using BasicToken
// mock class using BasicToken
contract BasicTokenMock is BasicToken {
contract BasicTokenMock is BasicToken {
function BasicTokenMock(address initialAccount, uint256 initialBalance) {
function BasicTokenMock(address initialAccount, uint256 initialBalance)
public
{
balances[initialAccount] = initialBalance;
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
totalSupply = initialBalance;
}
}
...
...
test/helpers/BurnableTokenMock.sol
View file @
c6e0edb2
...
@@ -4,7 +4,7 @@ import '../../contracts/token/BurnableToken.sol';
...
@@ -4,7 +4,7 @@ import '../../contracts/token/BurnableToken.sol';
contract BurnableTokenMock is BurnableToken {
contract BurnableTokenMock is BurnableToken {
function BurnableTokenMock(address initialAccount, uint initialBalance) {
function BurnableTokenMock(address initialAccount, uint initialBalance)
public
{
balances[initialAccount] = initialBalance;
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
totalSupply = initialBalance;
}
}
...
...
test/helpers/CappedCrowdsaleImpl.sol
View file @
c6e0edb2
...
@@ -12,7 +12,7 @@ contract CappedCrowdsaleImpl is CappedCrowdsale {
...
@@ -12,7 +12,7 @@ contract CappedCrowdsaleImpl is CappedCrowdsale {
uint256 _rate,
uint256 _rate,
address _wallet,
address _wallet,
uint256 _cap
uint256 _cap
)
)
public
Crowdsale(_startTime, _endTime, _rate, _wallet)
Crowdsale(_startTime, _endTime, _rate, _wallet)
CappedCrowdsale(_cap)
CappedCrowdsale(_cap)
{
{
...
...
test/helpers/DayLimitMock.sol
View file @
c6e0edb2
...
@@ -4,7 +4,7 @@ import "../../contracts/DayLimit.sol";
...
@@ -4,7 +4,7 @@ import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
contract DayLimitMock is DayLimit {
uint256 public totalSpending;
uint256 public totalSpending;
function DayLimitMock(uint256 _value) DayLimit(_value) {
function DayLimitMock(uint256 _value)
public
DayLimit(_value) {
totalSpending = 0;
totalSpending = 0;
}
}
...
...
test/helpers/DetailedERC20Mock.sol
View file @
c6e0edb2
...
@@ -4,5 +4,5 @@ import '../../contracts/token/StandardToken.sol';
...
@@ -4,5 +4,5 @@ import '../../contracts/token/StandardToken.sol';
import '../../contracts/token/DetailedERC20.sol';
import '../../contracts/token/DetailedERC20.sol';
contract DetailedERC20Mock is StandardToken, DetailedERC20 {
contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) {}
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals)
public
{}
}
}
test/helpers/ERC23TokenMock.sol
View file @
c6e0edb2
...
@@ -10,13 +10,13 @@ contract ERC23ContractInterface {
...
@@ -10,13 +10,13 @@ contract ERC23ContractInterface {
contract ERC23TokenMock is BasicToken {
contract ERC23TokenMock is BasicToken {
function ERC23TokenMock(address initialAccount, uint256 initialBalance) {
function ERC23TokenMock(address initialAccount, uint256 initialBalance)
public
{
balances[initialAccount] = initialBalance;
balances[initialAccount] = initialBalance;
totalSupply = initialBalance;
totalSupply = initialBalance;
}
}
// ERC23 compatible transfer function (except the name)
// ERC23 compatible transfer function (except the name)
function transferERC23(address _to, uint256 _value, bytes _data)
function transferERC23(address _to, uint256 _value, bytes _data)
public
returns (bool success)
returns (bool success)
{
{
transfer(_to, _value);
transfer(_to, _value);
...
...
test/helpers/FinalizableCrowdsaleImpl.sol
View file @
c6e0edb2
...
@@ -11,7 +11,7 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
...
@@ -11,7 +11,7 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
uint256 _endTime,
uint256 _endTime,
uint256 _rate,
uint256 _rate,
address _wallet
address _wallet
)
)
public
Crowdsale(_startTime, _endTime, _rate, _wallet)
Crowdsale(_startTime, _endTime, _rate, _wallet)
FinalizableCrowdsale()
FinalizableCrowdsale()
{
{
...
...
test/helpers/ForceEther.sol
View file @
c6e0edb2
...
@@ -7,9 +7,9 @@ pragma solidity ^0.4.18;
...
@@ -7,9 +7,9 @@ pragma solidity ^0.4.18;
// @author Remco Bloemen <remco@neufund.org>
// @author Remco Bloemen <remco@neufund.org>
contract ForceEther {
contract ForceEther {
function ForceEther() payable { }
function ForceEther() p
ublic p
ayable { }
function destroyAndSend(address _recipient) {
function destroyAndSend(address _recipient)
public
{
selfdestruct(_recipient);
selfdestruct(_recipient);
}
}
}
}
test/helpers/HasNoEtherTest.sol
View file @
c6e0edb2
...
@@ -5,7 +5,7 @@ import "../../contracts/ownership/HasNoEther.sol";
...
@@ -5,7 +5,7 @@ import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther {
contract HasNoEtherTest is HasNoEther {
// Constructor with explicit payable — should still fail
// Constructor with explicit payable — should still fail
function HasNoEtherTest() payable {
function HasNoEtherTest() p
ublic p
ayable {
}
}
}
}
test/helpers/InsecureTargetBounty.sol
View file @
c6e0edb2
...
@@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
...
@@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
contract InsecureTargetMock is Target {
contract InsecureTargetMock is Target {
function checkInvariant() returns(bool){
function checkInvariant()
public
returns(bool){
return false;
return false;
}
}
}
}
...
...
test/helpers/LimitBalanceMock.sol
View file @
c6e0edb2
...
@@ -7,7 +7,7 @@ import '../../contracts/LimitBalance.sol';
...
@@ -7,7 +7,7 @@ import '../../contracts/LimitBalance.sol';
// mock class using LimitBalance
// mock class using LimitBalance
contract LimitBalanceMock is LimitBalance(1000) {
contract LimitBalanceMock is LimitBalance(1000) {
function limitedDeposit() payable limitedPayable {
function limitedDeposit() p
ublic p
ayable limitedPayable {
}
}
}
}
test/helpers/PausableMock.sol
View file @
c6e0edb2
...
@@ -9,7 +9,7 @@ contract PausableMock is Pausable {
...
@@ -9,7 +9,7 @@ contract PausableMock is Pausable {
bool public drasticMeasureTaken;
bool public drasticMeasureTaken;
uint256 public count;
uint256 public count;
function PausableMock() {
function PausableMock()
public
{
drasticMeasureTaken = false;
drasticMeasureTaken = false;
count = 0;
count = 0;
}
}
...
...
test/helpers/PausableTokenMock.sol
View file @
c6e0edb2
...
@@ -5,7 +5,7 @@ import '../../contracts/token/PausableToken.sol';
...
@@ -5,7 +5,7 @@ import '../../contracts/token/PausableToken.sol';
// mock class using PausableToken
// mock class using PausableToken
contract PausableTokenMock is PausableToken {
contract PausableTokenMock is PausableToken {
function PausableTokenMock(address initialAccount, uint initialBalance) {
function PausableTokenMock(address initialAccount, uint initialBalance)
public
{
balances[initialAccount] = initialBalance;
balances[initialAccount] = initialBalance;
}
}
...
...
test/helpers/PullPaymentMock.sol
View file @
c6e0edb2
...
@@ -7,10 +7,10 @@ import '../../contracts/payment/PullPayment.sol';
...
@@ -7,10 +7,10 @@ import '../../contracts/payment/PullPayment.sol';
// mock class using PullPayment
// mock class using PullPayment
contract PullPaymentMock is PullPayment {
contract PullPaymentMock is PullPayment {
function PullPaymentMock() payable { }
function PullPaymentMock() p
ublic p
ayable { }
// test helper function to call asyncSend
// test helper function to call asyncSend
function callSend(address dest, uint256 amount) {
function callSend(address dest, uint256 amount)
public
{
asyncSend(dest, amount);
asyncSend(dest, amount);
}
}
...
...
test/helpers/ReentrancyAttack.sol
View file @
c6e0edb2
...
@@ -2,7 +2,7 @@ pragma solidity ^0.4.18;
...
@@ -2,7 +2,7 @@ pragma solidity ^0.4.18;
contract ReentrancyAttack {
contract ReentrancyAttack {
function callSender(bytes4 data) {
function callSender(bytes4 data)
public
{
require(msg.sender.call(data));
require(msg.sender.call(data));
}
}
...
...
test/helpers/ReentrancyMock.sol
View file @
c6e0edb2
...
@@ -7,7 +7,7 @@ contract ReentrancyMock is ReentrancyGuard {
...
@@ -7,7 +7,7 @@ contract ReentrancyMock is ReentrancyGuard {
uint256 public counter;
uint256 public counter;
function ReentrancyMock() {
function ReentrancyMock()
public
{
counter = 0;
counter = 0;
}
}
...
...
test/helpers/RefundableCrowdsaleImpl.sol
View file @
c6e0edb2
...
@@ -12,7 +12,7 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
...
@@ -12,7 +12,7 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
uint256 _rate,
uint256 _rate,
address _wallet,
address _wallet,
uint256 _goal
uint256 _goal
)
)
public
Crowdsale(_startTime, _endTime, _rate, _wallet)
Crowdsale(_startTime, _endTime, _rate, _wallet)
RefundableCrowdsale(_goal)
RefundableCrowdsale(_goal)
{
{
...
...
test/helpers/SafeERC20Helper.sol
View file @
c6e0edb2
...
@@ -4,45 +4,45 @@ import '../../contracts/token/ERC20.sol';
...
@@ -4,45 +4,45 @@ import '../../contracts/token/ERC20.sol';
import '../../contracts/token/SafeERC20.sol';
import '../../contracts/token/SafeERC20.sol';
contract ERC20FailingMock is ERC20 {
contract ERC20FailingMock is ERC20 {
function transfer(address, uint256) returns (bool) {
function transfer(address, uint256)
public
returns (bool) {
return false;
return false;
}
}
function transferFrom(address, address, uint256) returns (bool) {
function transferFrom(address, address, uint256)
public
returns (bool) {
return false;
return false;
}
}
function approve(address, uint256) returns (bool) {
function approve(address, uint256)
public
returns (bool) {
return false;
return false;
}
}
function balanceOf(address) constant returns (uint256) {
function balanceOf(address)
public
constant returns (uint256) {
return 0;
return 0;
}
}
function allowance(address, address) constant returns (uint256) {
function allowance(address, address)
public
constant returns (uint256) {
return 0;
return 0;
}
}
}
}
contract ERC20SucceedingMock is ERC20 {
contract ERC20SucceedingMock is ERC20 {
function transfer(address, uint256) returns (bool) {
function transfer(address, uint256)
public
returns (bool) {
return true;
return true;
}
}
function transferFrom(address, address, uint256) returns (bool) {
function transferFrom(address, address, uint256)
public
returns (bool) {
return true;
return true;
}
}
function approve(address, uint256) returns (bool) {
function approve(address, uint256)
public
returns (bool) {
return true;
return true;
}
}
function balanceOf(address) constant returns (uint256) {
function balanceOf(address)
public
constant returns (uint256) {
return 0;
return 0;
}
}
function allowance(address, address) constant returns (uint256) {
function allowance(address, address)
public
constant returns (uint256) {
return 0;
return 0;
}
}
}
}
...
@@ -53,32 +53,32 @@ contract SafeERC20Helper {
...
@@ -53,32 +53,32 @@ contract SafeERC20Helper {
ERC20 failing;
ERC20 failing;
ERC20 succeeding;
ERC20 succeeding;
function SafeERC20Helper() {
function SafeERC20Helper()
public
{
failing = new ERC20FailingMock();
failing = new ERC20FailingMock();
succeeding = new ERC20SucceedingMock();
succeeding = new ERC20SucceedingMock();
}
}
function doFailingTransfer() {
function doFailingTransfer()
public
{
failing.safeTransfer(0, 0);
failing.safeTransfer(0, 0);
}
}
function doFailingTransferFrom() {
function doFailingTransferFrom()
public
{
failing.safeTransferFrom(0, 0, 0);
failing.safeTransferFrom(0, 0, 0);
}
}
function doFailingApprove() {
function doFailingApprove()
public
{
failing.safeApprove(0, 0);
failing.safeApprove(0, 0);
}
}
function doSucceedingTransfer() {
function doSucceedingTransfer()
public
{
succeeding.safeTransfer(0, 0);
succeeding.safeTransfer(0, 0);
}
}
function doSucceedingTransferFrom() {
function doSucceedingTransferFrom()
public
{
succeeding.safeTransferFrom(0, 0, 0);
succeeding.safeTransferFrom(0, 0, 0);
}
}
function doSucceedingApprove() {
function doSucceedingApprove()
public
{
succeeding.safeApprove(0, 0);
succeeding.safeApprove(0, 0);
}
}
}
}
test/helpers/SafeMathMock.sol
View file @
c6e0edb2
...
@@ -7,15 +7,15 @@ import '../../contracts/math/SafeMath.sol';
...
@@ -7,15 +7,15 @@ import '../../contracts/math/SafeMath.sol';
contract SafeMathMock {
contract SafeMathMock {
uint256 public result;
uint256 public result;
function multiply(uint256 a, uint256 b) {
function multiply(uint256 a, uint256 b)
public
{
result = SafeMath.mul(a, b);
result = SafeMath.mul(a, b);
}
}
function subtract(uint256 a, uint256 b) {
function subtract(uint256 a, uint256 b)
public
{
result = SafeMath.sub(a, b);
result = SafeMath.sub(a, b);
}
}
function add(uint256 a, uint256 b) {
function add(uint256 a, uint256 b)
public
{
result = SafeMath.add(a, b);
result = SafeMath.add(a, b);
}
}
}
}
test/helpers/SecureTargetBounty.sol
View file @
c6e0edb2
...
@@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
...
@@ -5,7 +5,7 @@ import {Bounty, Target} from "../../contracts/Bounty.sol";
contract SecureTargetMock is Target {
contract SecureTargetMock is Target {
function checkInvariant() returns(bool) {
function checkInvariant()
public
returns(bool) {
return true;
return true;
}
}
}
}
...
...
test/helpers/SplitPaymentMock.sol
View file @
c6e0edb2
...
@@ -4,7 +4,7 @@ import '../../contracts/payment/SplitPayment.sol';
...
@@ -4,7 +4,7 @@ import '../../contracts/payment/SplitPayment.sol';
// mock class using SplitPayment
// mock class using SplitPayment
contract SplitPaymentMock is SplitPayment {
contract SplitPaymentMock is SplitPayment {
function SplitPaymentMock(address[] _payees, uint256[] _shares)
function SplitPaymentMock(address[] _payees, uint256[] _shares)
public
SplitPayment(_payees, _shares) payable {}
SplitPayment(_payees, _shares) payable {}
function () payable {}
function () p
ublic p
ayable {}
}
}
test/helpers/StandardTokenMock.sol
View file @
c6e0edb2
...
@@ -7,7 +7,7 @@ import '../../contracts/token/StandardToken.sol';
...
@@ -7,7 +7,7 @@ import '../../contracts/token/StandardToken.sol';
// mock class using StandardToken
// mock class using StandardToken
contract StandardTokenMock is StandardToken {
contract StandardTokenMock is StandardToken {
function StandardTokenMock(address initialAccount, uint256 initialBalance) {
function StandardTokenMock(address initialAccount, uint256 initialBalance)
public
{
balances[initialAccount] = initialBalance;
balances[initialAccount] = initialBalance;
totalSupply = 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