cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update compilation tests.

Browse Source
This commit is contained in:
chriseth 2018-06-14 12:28:33 +02:00 committed by Alex Beregszaszi
parent 17493e64ed
commit e299a0031f
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/compilationTests/corion/moduleHandler.sol
View File

@ -117,7 +117,7 @@ contract moduleHandler is multiOwner, announcementTypes {
@id Index of module. @id Index of module.
@found Was there any result or not. @found Was there any result or not.
*/ */
bytes32 _name = keccak256(name); bytes32 _name = keccak256(bytes(name));
for ( uint256 a=0 ; a<modules.length ; a++ ) { for ( uint256 a=0 ; a<modules.length ; a++ ) {
if ( modules[a].name == _name ) { if ( modules[a].name == _name ) {
return (true, true, a); return (true, true, a);
@ -153,7 +153,7 @@ contract moduleHandler is multiOwner, announcementTypes {
require( _success ); require( _success );
if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) { if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(name, addr, callCallback))) ) { if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(abi.encodePacked(name, addr, callCallback)))) ) {
return true; return true;
} }
} }
@ -169,7 +169,7 @@ contract moduleHandler is multiOwner, announcementTypes {
function callReplaceCallback(string moduleName, address newModule) external returns (bool success) { function callReplaceCallback(string moduleName, address newModule) external returns (bool success) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("callReplaceCallback", keccak256(moduleName, newModule))) ) { if ( ! insertAndCheckDo(calcDoHash("callReplaceCallback", keccak256(abi.encodePacked(moduleName, newModule)))) ) {
return true; return true;
} }
(bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName); (bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName);
@ -192,11 +192,11 @@ contract moduleHandler is multiOwner, announcementTypes {
require( _success ); require( _success );
if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) { if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("newModule", keccak256(name, addr, schellingEvent, transferEvent))) ) { if ( ! insertAndCheckDo(calcDoHash("newModule", keccak256(abi.encodePacked(name, addr, schellingEvent, transferEvent)))) ) {
return true; return true;
} }
} }
addModule( modules_s(addr, keccak256(name), schellingEvent, transferEvent), true); addModule( modules_s(addr, keccak256(bytes(name)), schellingEvent, transferEvent), true);
return true; return true;
} }
function dropModule(string name, bool callCallback) external returns (bool success) { function dropModule(string name, bool callCallback) external returns (bool success) {
@ -211,7 +211,7 @@ contract moduleHandler is multiOwner, announcementTypes {
require( _success ); require( _success );
if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) { if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(name, callCallback))) ) { if ( ! insertAndCheckDo(calcDoHash("replaceModule", keccak256(abi.encodePacked(name, callCallback)))) ) {
return true; return true;
} }
} }
@ -226,7 +226,7 @@ contract moduleHandler is multiOwner, announcementTypes {
function callDisableCallback(string moduleName) external returns (bool success) { function callDisableCallback(string moduleName) external returns (bool success) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("callDisableCallback", keccak256(moduleName))) ) { if ( ! insertAndCheckDo(calcDoHash("callDisableCallback", keccak256(bytes(moduleName)))) ) {
return true; return true;
} }
(bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName); (bool _success, bool _found, uint256 _id) = getModuleIDByName(moduleName);
@ -289,7 +289,7 @@ contract moduleHandler is multiOwner, announcementTypes {
require( _success ); require( _success );
if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) { if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("replaceModuleHandler", keccak256(newHandler))) ) { if ( ! insertAndCheckDo(calcDoHash("replaceModuleHandler", keccak256(abi.encodePacked(newHandler)))) ) {
return true; return true;
} }
} }
@ -419,7 +419,7 @@ contract moduleHandler is multiOwner, announcementTypes {
require( _success ); require( _success );
if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) { if ( ! ( _found && modules[_id].name == keccak256('Publisher') )) {
require( block.number < debugModeUntil ); require( block.number < debugModeUntil );
if ( ! insertAndCheckDo(calcDoHash("configureModule", keccak256(moduleName, aType, value))) ) { if ( ! insertAndCheckDo(calcDoHash("configureModule", keccak256(abi.encodePacked(moduleName, aType, value)))) ) {
return true; return true;
} }
} }
@ -437,7 +437,7 @@ contract moduleHandler is multiOwner, announcementTypes {
*/ */
require( owners[msg.sender] ); require( owners[msg.sender] );
if ( forever ) { if ( forever ) {
if ( ! insertAndCheckDo(calcDoHash("freezing", keccak256(forever))) ) { if ( ! insertAndCheckDo(calcDoHash("freezing", keccak256(abi.encodePacked(forever)))) ) {
return; return;
} }
} }

6
test/compilationTests/corion/multiOwner.sol
View File

@ -21,12 +21,12 @@ contract multiOwner is safeMath {
Externals Externals
*/ */
function insertOwner(address addr) external { function insertOwner(address addr) external {
if ( insertAndCheckDo(calcDoHash("insertOwner", keccak256(addr))) ) { if ( insertAndCheckDo(calcDoHash("insertOwner", keccak256(abi.encodePacked(addr)))) ) {
_addOwner(addr); _addOwner(addr);
} }
} }
function dropOwner(address addr) external { function dropOwner(address addr) external {
if ( insertAndCheckDo(calcDoHash("dropOwner", keccak256(addr))) ) { if ( insertAndCheckDo(calcDoHash("dropOwner", keccak256(abi.encodePacked(addr)))) ) {
_delOwner(addr); _delOwner(addr);
} }
} }
@ -42,7 +42,7 @@ contract multiOwner is safeMath {
return ownerCount * 75 / 100; return ownerCount * 75 / 100;
} }
function calcDoHash(string job, bytes32 data) public constant returns (bytes32 hash) { function calcDoHash(string job, bytes32 data) public constant returns (bytes32 hash) {
return keccak256(job, data); return keccak256(abi.encodePacked(job, data));
} }
function validDoHash(bytes32 doHash) public constant returns (bool valid) { function validDoHash(bytes32 doHash) public constant returns (bool valid) {
return doDB[doHash].length > 0; return doDB[doHash].length > 0;

2
test/compilationTests/corion/schelling.sol
View File

@ -335,7 +335,7 @@ contract schelling is module, announcementTypes, schellingVars {
require( voter.status == voterStatus.afterPrepareVote ); require( voter.status == voterStatus.afterPrepareVote );
require( voter.roundID < currentRound ); require( voter.roundID < currentRound );
if ( keccak256(vote) == voter.hash ) { if ( keccak256(bytes(vote)) == voter.hash ) {
delete voter.hash; delete voter.hash;
if (round.blockHeight+roundBlockDelay/2 >= block.number) { if (round.blockHeight+roundBlockDelay/2 >= block.number) {
if ( bytes(vote)[0] == aboveChar ) { if ( bytes(vote)[0] == aboveChar ) {

2
test/compilationTests/gnosis/Events/CategoricalEvent.sol
View File

@ -48,6 +48,6 @@ contract CategoricalEvent is Event {
constant constant
returns (bytes32) returns (bytes32)
{ {
return keccak256(collateralToken, oracle, outcomeTokens.length); return keccak256(abi.encodePacked(collateralToken, oracle, outcomeTokens.length));
} }
} }

4
test/compilationTests/gnosis/Events/EventFactory.sol
View File

@ -35,7 +35,7 @@ contract EventFactory {
public public
returns (CategoricalEvent eventContract) returns (CategoricalEvent eventContract)
{ {
bytes32 eventHash = keccak256(collateralToken, oracle, outcomeCount); bytes32 eventHash = keccak256(abi.encodePacked(collateralToken, oracle, outcomeCount));
// Event should not exist yet // Event should not exist yet
require(address(categoricalEvents[eventHash]) == address(0)); require(address(categoricalEvents[eventHash]) == address(0));
// Create event // Create event
@ -63,7 +63,7 @@ contract EventFactory {
public public
returns (ScalarEvent eventContract) returns (ScalarEvent eventContract)
{ {
bytes32 eventHash = keccak256(collateralToken, oracle, lowerBound, upperBound); bytes32 eventHash = keccak256(abi.encodePacked(collateralToken, oracle, lowerBound, upperBound));
// Event should not exist yet // Event should not exist yet
require(address(scalarEvents[eventHash]) == address(0)); require(address(scalarEvents[eventHash]) == address(0));
// Create event // Create event

2
test/compilationTests/gnosis/Events/ScalarEvent.sol
View File

@ -82,6 +82,6 @@ contract ScalarEvent is Event {
constant constant
returns (bytes32) returns (bytes32)
{ {
return keccak256(collateralToken, oracle, lowerBound, upperBound); return keccak256(abi.encodePacked(collateralToken, oracle, lowerBound, upperBound));
} }
} }

4
test/compilationTests/gnosis/Oracles/SignedMessageOracle.sol
View File

@ -58,7 +58,7 @@ contract SignedMessageOracle is Oracle {
// Result is not set yet and nonce and signer are valid // Result is not set yet and nonce and signer are valid
require( !isSet require( !isSet
&& _nonce > nonce && _nonce > nonce
&& signer == ecrecover(keccak256(descriptionHash, newSigner, _nonce), v, r, s)); && signer == ecrecover(keccak256(abi.encodePacked(descriptionHash, newSigner, _nonce)), v, r, s));
nonce = _nonce; nonce = _nonce;
signer = newSigner; signer = newSigner;
SignerReplacement(newSigner); SignerReplacement(newSigner);
@ -74,7 +74,7 @@ contract SignedMessageOracle is Oracle {
{ {
// Result is not set yet and signer is valid // Result is not set yet and signer is valid
require( !isSet require( !isSet
&& signer == ecrecover(keccak256(descriptionHash, _outcome), v, r, s)); && signer == ecrecover(keccak256(abi.encodePacked(descriptionHash, _outcome)), v, r, s));
isSet = true; isSet = true;
outcome = _outcome; outcome = _outcome;
OutcomeAssignment(_outcome); OutcomeAssignment(_outcome);

2
test/compilationTests/zeppelin/MultisigWallet.sol
View File

@ -66,7 +66,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
return 0; return 0;
} }
// determine our operation hash. // determine our operation hash.
_r = keccak256(msg.data, block.number); _r = keccak256(abi.encodePacked(msg.data, block.number));
if (!confirm(_r) && txs[_r].to == address(0)) { if (!confirm(_r) && txs[_r].to == address(0)) {
txs[_r].to = _to; txs[_r].to = _to;
txs[_r].value = _value; txs[_r].value = _value;