Skip to content

O
openzeppelin-contracts-upgradeable
Unverified Commit ba4cf03d by Leo Arias Committed by GitHub
Options

contracts mocks: replace deprecated constant with view (#931)

parent 39370ff6
Showing with 188 additions and 148 deletions
.soliumrc.json
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"no-empty-blocks": "off", "no-empty-blocks": "off",
"indentation": ["error", 2], "indentation": ["error", 2],
"arg-overflow": ["warning", 3], "arg-overflow": ["warning", 3],
"no-constant": ["error"],
"security/enforce-explicit-visibility": ["error"], "security/enforce-explicit-visibility": ["error"],
"security/no-block-members": ["warning"], "security/no-block-members": ["warning"],
"security/no-inline-assembly": ["warning"] "security/no-inline-assembly": ["warning"]
......
contracts/mocks/SafeERC20Helper.sol
...@@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 { ...@@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 {
return false; return false;
} }
function balanceOf(address) public constant returns (uint256) { function balanceOf(address) public view returns (uint256) {
return 0; return 0;
} }
function allowance(address, address) public constant returns (uint256) { function allowance(address, address) public view returns (uint256) {
return 0; return 0;
} }
} }
...@@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 { ...@@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 {
return true; return true;
} }
function balanceOf(address) public constant returns (uint256) { function balanceOf(address) public view returns (uint256) {
return 0; return 0;
} }
function allowance(address, address) public constant returns (uint256) { function allowance(address, address) public view returns (uint256) {
return 0; return 0;
} }
} }
......
package-lock.json
...@@ -1253,6 +1253,12 @@ ...@@ -1253,6 +1253,12 @@
"create-hash": "1.1.3" "create-hash": "1.1.3"
} }
}, },
"buffer-from": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz",
"integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
"dev": true
},
"buffer-xor": { "buffer-xor": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
...@@ -2603,7 +2609,7 @@ ...@@ -2603,7 +2609,7 @@
"integrity": "sha512-dBTav4AZQ7zuajmICv1k7bEesqS+8f0u0wciXNUJZb842RTBi0lgKEDF8WgZshzv4ThI+XVQSRNV/A+seiK4aA==", "integrity": "sha512-dBTav4AZQ7zuajmICv1k7bEesqS+8f0u0wciXNUJZb842RTBi0lgKEDF8WgZshzv4ThI+XVQSRNV/A+seiK4aA==",
"dev": true, "dev": true,
"requires": { "requires": {
"source-map-support": "0.5.4", "source-map-support": "0.5.5",
"webpack-cli": "2.0.14" "webpack-cli": "2.0.14"
}, },
"dependencies": { "dependencies": {
...@@ -2614,11 +2620,12 @@ ...@@ -2614,11 +2620,12 @@
"dev": true "dev": true
}, },
"source-map-support": { "source-map-support": {
"version": "0.5.4", "version": "0.5.5",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz",
"integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
"dev": true, "dev": true,
"requires": { "requires": {
"buffer-from": "1.0.0",
"source-map": "0.6.1" "source-map": "0.6.1"
} }
} }
...@@ -2671,51 +2678,6 @@ ...@@ -2671,51 +2678,6 @@
"secp256k1": "3.3.0" "secp256k1": "3.3.0"
} }
}, },
"ethereumjs-vm": {
"version": "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#328771cace30ed16ad5c1d13a69cda13d31173f9",
"dev": true,
"requires": {
"async": "2.5.0",
"async-eventemitter": "0.2.3",
"ethereum-common": "0.0.18",
"ethereumjs-account": "2.0.4",
"ethereumjs-block": "1.2.2",
"ethereumjs-util": "4.5.0",
"fake-merkle-patricia-tree": "1.0.1",
"functional-red-black-tree": "1.0.1",
"merkle-patricia-tree": "2.1.2"
},
"dependencies": {
"async": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
"integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
"dev": true,
"requires": {
"lodash": "4.17.4"
}
},
"ethereum-common": {
"version": "0.0.18",
"resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
"integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=",
"dev": true
},
"ethereumjs-util": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz",
"integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=",
"dev": true,
"requires": {
"bn.js": "4.11.8",
"create-hash": "1.1.3",
"keccakjs": "0.2.1",
"rlp": "2.0.0",
"secp256k1": "3.3.0"
}
}
}
},
"ethereumjs-wallet": { "ethereumjs-wallet": {
"version": "0.6.0", "version": "0.6.0",
"resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz",
...@@ -6993,6 +6955,12 @@ ...@@ -6993,6 +6955,12 @@
"is-promise": "2.1.0" "is-promise": "2.1.0"
} }
}, },
"rustbn.js": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.1.2.tgz",
"integrity": "sha512-bAkNqSHYdJdFsBC7Z11JgzYktL31HIpB2o70jZcGiL1U1TVtPyvaVhDrGWwS8uZtaqwW2k6NOPGZCqW/Dgh5Lg==",
"dev": true
},
"rx-lite": { "rx-lite": {
"version": "4.0.8", "version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
...@@ -7267,8 +7235,8 @@ ...@@ -7267,8 +7235,8 @@
"sol-explore": "1.6.2", "sol-explore": "1.6.2",
"solidity-parser-sc": "0.4.8", "solidity-parser-sc": "0.4.8",
"web3": "0.18.4" "web3": "0.18.4"
}
}, },
"dependencies": {
"solidity-parser-sc": { "solidity-parser-sc": {
"version": "0.4.8", "version": "0.4.8",
"resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.8.tgz", "resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.8.tgz",
...@@ -7278,6 +7246,28 @@ ...@@ -7278,6 +7246,28 @@
"mocha": "2.5.3", "mocha": "2.5.3",
"pegjs": "0.10.0", "pegjs": "0.10.0",
"yargs": "4.8.1" "yargs": "4.8.1"
},
"dependencies": {
"yargs": {
"version": "4.8.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
"integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
"dev": true,
"requires": {
"cliui": "3.2.0",
"decamelize": "1.2.0",
"get-caller-file": "1.0.2",
"lodash.assign": "4.2.0",
"os-locale": "1.4.0",
"read-pkg-up": "1.0.1",
"require-directory": "2.1.1",
"require-main-filename": "1.0.1",
"set-blocking": "2.0.0",
"string-width": "1.0.2",
"which-module": "1.0.0",
"window-size": "0.2.0",
"y18n": "3.2.1",
"yargs-parser": "2.4.1"
} }
} }
} }
...@@ -7301,31 +7291,6 @@ ...@@ -7301,31 +7291,6 @@
"text-table": "0.2.0" "text-table": "0.2.0"
}, },
"dependencies": { "dependencies": {
"sol-explore": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.1.tgz",
"integrity": "sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs=",
"dev": true
}
}
},
"solium-plugin-security": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz",
"integrity": "sha512-kpLirBwIq4mhxk0Y/nn5cQ6qdJTI+U1LO3gpoNIcqNaW+sI058moXBe2UiHs+9wvF9IzYD49jcKhFTxcR9u9SQ==",
"dev": true
},
"solparse": {
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.5.tgz",
"integrity": "sha512-t7tvtR6KU6QfPYLMv1nlCh9DA8HYIu5tbjHpKu0fhGFZ1NuSp0KKDHfFHv07g6v1xgcuUY3rVqNFjZt5b9+5qA==",
"dev": true,
"requires": {
"mocha": "4.1.0",
"pegjs": "0.10.0",
"yargs": "10.1.2"
},
"dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
...@@ -7420,6 +7385,23 @@ ...@@ -7420,6 +7385,23 @@
"mem": "1.1.0" "mem": "1.1.0"
} }
}, },
"sol-explore": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.1.tgz",
"integrity": "sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs=",
"dev": true
},
"solparse": {
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.5.tgz",
"integrity": "sha512-t7tvtR6KU6QfPYLMv1nlCh9DA8HYIu5tbjHpKu0fhGFZ1NuSp0KKDHfFHv07g6v1xgcuUY3rVqNFjZt5b9+5qA==",
"dev": true,
"requires": {
"mocha": "4.1.0",
"pegjs": "0.10.0",
"yargs": "10.1.2"
}
},
"string-width": { "string-width": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
...@@ -7485,6 +7467,12 @@ ...@@ -7485,6 +7467,12 @@
} }
} }
}, },
"solium-plugin-security": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz",
"integrity": "sha512-kpLirBwIq4mhxk0Y/nn5cQ6qdJTI+U1LO3gpoNIcqNaW+sI058moXBe2UiHs+9wvF9IzYD49jcKhFTxcR9u9SQ==",
"dev": true
},
"sort-keys": { "sort-keys": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
...@@ -8001,6 +7989,28 @@ ...@@ -8001,6 +7989,28 @@
"requires": { "requires": {
"has-flag": "1.0.0" "has-flag": "1.0.0"
} }
},
"yargs": {
"version": "4.8.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz",
"integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=",
"dev": true,
"requires": {
"cliui": "3.2.0",
"decamelize": "1.2.0",
"get-caller-file": "1.0.2",
"lodash.assign": "4.2.0",
"os-locale": "1.4.0",
"read-pkg-up": "1.0.1",
"require-directory": "2.1.1",
"require-main-filename": "1.0.1",
"set-blocking": "2.0.0",
"string-width": "1.0.2",
"which-module": "1.0.0",
"window-size": "0.2.0",
"y18n": "3.2.1",
"yargs-parser": "2.4.1"
}
} }
} }
}, },
...@@ -8025,10 +8035,6 @@ ...@@ -8025,10 +8035,6 @@
"lodash": "4.17.4" "lodash": "4.17.4"
} }
}, },
"bignumber.js": {
"version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
"dev": true
},
"ethereum-common": { "ethereum-common": {
"version": "0.0.18", "version": "0.0.18",
"resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
...@@ -8069,7 +8075,7 @@ ...@@ -8069,7 +8075,7 @@
"ethereumjs-block": "1.2.2", "ethereumjs-block": "1.2.2",
"ethereumjs-tx": "1.3.3", "ethereumjs-tx": "1.3.3",
"ethereumjs-util": "5.1.2", "ethereumjs-util": "5.1.2",
"ethereumjs-vm": "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#328771cace30ed16ad5c1d13a69cda13d31173f9", "ethereumjs-vm": "2.3.5",
"isomorphic-fetch": "2.2.1", "isomorphic-fetch": "2.2.1",
"request": "2.79.0", "request": "2.79.0",
"semaphore": "1.1.0", "semaphore": "1.1.0",
...@@ -8084,6 +8090,61 @@ ...@@ -8084,6 +8090,61 @@
"version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9",
"dev": true "dev": true
}, },
"ethereum-common": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz",
"integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==",
"dev": true
},
"ethereumjs-vm": {
"version": "2.3.5",
"resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.3.5.tgz",
"integrity": "sha512-AJ7x44+xqyE5+UO3Nns19WkTdZfyqFZ+sEjIEpvme7Ipbe3iBU1uwCcHEdiu/yY9bdhr3IfSa/NfIKNeXPaRVQ==",
"dev": true,
"requires": {
"async": "2.5.0",
"async-eventemitter": "0.2.3",
"ethereum-common": "0.2.0",
"ethereumjs-account": "2.0.4",
"ethereumjs-block": "1.7.1",
"ethereumjs-util": "5.2.0",
"fake-merkle-patricia-tree": "1.0.1",
"functional-red-black-tree": "1.0.1",
"merkle-patricia-tree": "2.1.2",
"rustbn.js": "0.1.2",
"safe-buffer": "5.1.1"
},
"dependencies": {
"ethereumjs-block": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz",
"integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==",
"dev": true,
"requires": {
"async": "2.5.0",
"ethereum-common": "0.2.0",
"ethereumjs-tx": "1.3.3",
"ethereumjs-util": "5.2.0",
"merkle-patricia-tree": "2.1.2"
}
},
"ethereumjs-util": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
"integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
"dev": true,
"requires": {
"bn.js": "4.11.8",
"create-hash": "1.1.3",
"ethjs-util": "0.1.4",
"keccak": "1.3.0",
"rlp": "2.0.0",
"safe-buffer": "5.1.1",
"secp256k1": "3.3.0"
}
}
}
},
"web3": { "web3": {
"version": "0.16.0", "version": "0.16.0",
"resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz",
...@@ -8150,54 +8211,6 @@ ...@@ -8150,54 +8211,6 @@
"source-map": "0.5.6", "source-map": "0.5.6",
"uglify-to-browserify": "1.0.2", "uglify-to-browserify": "1.0.2",
"yargs": "3.10.0" "yargs": "3.10.0"
},
"dependencies": {
"camelcase": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
"integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
"dev": true,
"optional": true
},
"cliui": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"dev": true,
"optional": true,
"requires": {
"center-align": "0.1.3",
"right-align": "0.1.3",
"wordwrap": "0.0.2"
}
},
"window-size": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
"dev": true,
"optional": true
},
"wordwrap": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
"dev": true,
"optional": true
},
"yargs": {
"version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"dev": true,
"optional": true,
"requires": {
"camelcase": "1.2.1",
"cliui": "2.1.0",
"decamelize": "1.2.0",
"window-size": "0.1.0"
}
}
} }
}, },
"uglify-to-browserify": { "uglify-to-browserify": {
...@@ -8780,25 +8793,51 @@ ...@@ -8780,25 +8793,51 @@
"dev": true "dev": true
}, },
"yargs": { "yargs": {
"version": "4.8.1", "version": "3.10.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
"integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"cliui": "3.2.0", "camelcase": "1.2.1",
"cliui": "2.1.0",
"decamelize": "1.2.0", "decamelize": "1.2.0",
"get-caller-file": "1.0.2", "window-size": "0.1.0"
"lodash.assign": "4.2.0", },
"os-locale": "1.4.0", "dependencies": {
"read-pkg-up": "1.0.1", "camelcase": {
"require-directory": "2.1.1", "version": "1.2.1",
"require-main-filename": "1.0.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
"set-blocking": "2.0.0", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
"string-width": "1.0.2", "dev": true,
"which-module": "1.0.0", "optional": true
"window-size": "0.2.0", },
"y18n": "3.2.1", "cliui": {
"yargs-parser": "2.4.1" "version": "2.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"dev": true,
"optional": true,
"requires": {
"center-align": "0.1.3",
"right-align": "0.1.3",
"wordwrap": "0.0.2"
}
},
"window-size": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
"dev": true,
"optional": true
},
"wordwrap": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
"integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
"dev": true,
"optional": true
}
} }
}, },
"yargs-parser": { "yargs-parser": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment