Update external contracts in compilationTests (to support strict address literals)

22 files changed, 54 insertions, 54 deletions

diff --git a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
index a6f67c7a..48b75230 100644
--- a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
+++ b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
@@ -50,7 +50,7 @@ contract MultiSigWallet {
     }
 
     modifier transactionExists(uint transactionId) {
-        if (transactions[transactionId].destination == 0)
+        if (transactions[transactionId].destination == address(0))
             throw;
         _;
     }
@@ -74,7 +74,7 @@ contract MultiSigWallet {
     }
 
     modifier notNull(address _address) {
-        if (_address == 0)
+        if (_address == address(0))
             throw;
         _;
     }
@@ -107,7 +107,7 @@ contract MultiSigWallet {
         validRequirement(_owners.length, _required)
     {
         for (uint i=0; i<_owners.length; i++) {
-            if (isOwner[_owners[i]] || _owners[i] == 0)
+            if (isOwner[_owners[i]] || _owners[i] == address(0))
                 throw;
             isOwner[_owners[i]] = true;
         }
diff --git a/test/compilationTests/corion/ico.sol b/test/compilationTests/corion/ico.sol
index c61e3448..13f8ab01 100644
--- a/test/compilationTests/corion/ico.sol
+++ b/test/compilationTests/corion/ico.sol
@@ -162,7 +162,7 @@ contract ico is safeMath {
         interest_s memory _idb;
         address _addr = beneficiary;
         uint256 _to = (block.number - startBlock) / interestBlockDelay;
-        if ( _addr == 0x00 ) { _addr = msg.sender; }
+        if ( _addr == address(0x00) ) { _addr = msg.sender; }
         
         require( block.number > icoDelay );
         require( ! aborted );
@@ -257,7 +257,7 @@ contract ico is safeMath {
             @premiumContractAddr    Address of the corion premium token contract
         */
         require( msg.sender == owner );
-        require( tokenAddr == 0x00 && premiumAddr == 0x00 );
+        require( tokenAddr == address(0x00) && premiumAddr == address(0x00) );
         tokenAddr = tokenContractAddr;
         premiumAddr = premiumContractAddr;
     }
@@ -281,7 +281,7 @@ contract ico is safeMath {
             If they call the contract without any function then this process will be taken place.
         */
         require( isICO() );
-        require( buy(msg.sender, 0x00) );
+        require( buy(msg.sender, address(0x00)) );
     }
     
     function buy(address beneficiaryAddress, address affilateAddress) payable returns (bool success) {
@@ -300,9 +300,9 @@ contract ico is safeMath {
             @affilateAddress        The address of the person who offered who will get the referral reward. It can not be equal with the beneficiaryAddress.
         */
         require( isICO() );
-        if ( beneficiaryAddress == 0x00) { beneficiaryAddress = msg.sender; }
+        if ( beneficiaryAddress == address(0x00)) { beneficiaryAddress = msg.sender; }
         if ( beneficiaryAddress == affilateAddress ) {
-            affilateAddress = 0x00;
+            affilateAddress = address(0x00);
         }
         uint256 _value = msg.value;
         if ( beneficiaryAddress.balance < 0.2 ether ) {
@@ -317,7 +317,7 @@ contract ico is safeMath {
         totalMint = safeAdd(totalMint, _reward);
         require( foundationAddress.send(_value * 10 / 100) );
         uint256 extra;
-        if ( affilateAddress != 0x00 && ( brought[affilateAddress].eth > 0 || interestDB[affilateAddress][0].amount > 0 ) ) {
+        if ( affilateAddress != address(0x00) && ( brought[affilateAddress].eth > 0 || interestDB[affilateAddress][0].amount > 0 ) ) {
             affiliate[affilateAddress].weight = safeAdd(affiliate[affilateAddress].weight, _reward);
             extra = affiliate[affilateAddress].weight;
             uint256 rate;
diff --git a/test/compilationTests/corion/module.sol b/test/compilationTests/corion/module.sol
index 51fb8231..5f13215f 100644
--- a/test/compilationTests/corion/module.sol
+++ b/test/compilationTests/corion/module.sol
@@ -123,7 +123,7 @@ contract module {
             
             @ret    This is the module handler address or not
         */
-        if ( moduleHandlerAddress == 0x00 ) { return true; }
+        if ( moduleHandlerAddress == address(0x00) ) { return true; }
         if ( moduleStatus != status.Connected ) { return false; }
         return addr == moduleHandlerAddress;
     }
diff --git a/test/compilationTests/corion/moduleHandler.sol b/test/compilationTests/corion/moduleHandler.sol
index d1f928c5..1d546b40 100644
--- a/test/compilationTests/corion/moduleHandler.sol
+++ b/test/compilationTests/corion/moduleHandler.sol
@@ -73,7 +73,7 @@ contract moduleHandler is multiOwner, announcementTypes {
         require( success && ! found );
         (success, found, id) = getModuleIDByHash(input.name);
         require( success && ! found );
-        (success, found, id) = getModuleIDByAddress(0x00);
+        (success, found, id) = getModuleIDByAddress(address(0x00));
         require( success );
         if ( ! found ) {
             id = modules.length;
@@ -92,7 +92,7 @@ contract moduleHandler is multiOwner, announcementTypes {
         */
         (bool _success, bool _found, uint256 _id) = getModuleIDByName(name);
         if ( _success && _found ) { return (true, true, modules[_id].addr); }
-        return (true, false, 0x00);
+        return (true, false, address(0x00));
     }
     function getModuleIDByHash(bytes32 hashOfName) public constant returns( bool success, bool found, uint256 id ) {
         /*
diff --git a/test/compilationTests/corion/owned.sol b/test/compilationTests/corion/owned.sol
index bd187775..4a5ba673 100644
--- a/test/compilationTests/corion/owned.sol
+++ b/test/compilationTests/corion/owned.sol
@@ -20,7 +20,7 @@ contract ownedDB {
             

             @bool   Owner has called the contract or not 

         */

-        if ( owner == 0x00 ) {

+        if ( owner == address(0x00) ) {

             return true;

         }

         return owner == msg.sender;

diff --git a/test/compilationTests/corion/premium.sol b/test/compilationTests/corion/premium.sol
index 2cf76088..843a2d16 100644
--- a/test/compilationTests/corion/premium.sol
+++ b/test/compilationTests/corion/premium.sol
@@ -53,7 +53,7 @@ contract premium is module, safeMath {
             @genesisValue       Array of the balance of the genesis addresses
         */
         super.registerModuleHandler(moduleHandler);
-        require( dbAddress != 0x00 );
+        require( dbAddress != address(0x00) );
         db = ptokenDB(dbAddress);
         if ( ! forReplace ) {
             require( db.replaceOwner(this) );
@@ -273,7 +273,7 @@ contract premium is module, safeMath {
             @to        For who?
             @amount    Amount
         */
-        require( from != 0x00 && to != 0x00 && to != 0xa636a97578d26a3b76b060bbc18226d954cf3757 );
+        require( from != address(0x00) && to != address(0x00) && to != 0xa636A97578d26A3b76B060Bbc18226d954cf3757 );
         require( ( ! isICO) || genesis[from] );
         require( db.decrease(from, amount) );
         require( db.increase(to, amount) );
diff --git a/test/compilationTests/corion/provider.sol b/test/compilationTests/corion/provider.sol
index 2cdd760d..b3b8169d 100644
--- a/test/compilationTests/corion/provider.sol
+++ b/test/compilationTests/corion/provider.sol
@@ -161,7 +161,7 @@ contract provider is module, safeMath, announcementTypes {
         if ( schellingRound == 0 ) {
             schellingRound = currentSchellingRound;
         }
-        if ( clients[addr].providerAddress != 0 ) {
+        if ( clients[addr].providerAddress != address(0x00) ) {
             ProviderAddress = clients[addr].providerAddress;
             ProviderHeight  = clients[addr].providerHeight;
             ConnectedOn     = clients[addr].providerConnected;
@@ -233,7 +233,7 @@ contract provider is module, safeMath, announcementTypes {
             @admin          The admin’s address
         */
         require( ! providers[msg.sender].data[providers[msg.sender].currentHeight].valid );
-        require( clients[msg.sender].providerAddress == 0x00 );
+        require( clients[msg.sender].providerAddress == address(0x00) );
         require( ! checkICO() );
         if ( priv ) {
             require( getTokenBalance(msg.sender) >= minFundsForPrivate );
@@ -245,7 +245,7 @@ contract provider is module, safeMath, announcementTypes {
         providers[msg.sender].currentHeight++;
         uint256 currHeight = providers[msg.sender].currentHeight;
         providers[msg.sender].data[currHeight].valid           = true;
-        if ( admin == 0x00 ) { 
+        if ( admin == address(0x00) ) {
             providers[msg.sender].data[currHeight].admin      = msg.sender;
         } else {
             providers[msg.sender].data[currHeight].admin      = admin;
@@ -288,7 +288,7 @@ contract provider is module, safeMath, announcementTypes {
         require( providers[addr].data[currHeight].valid );
         require( checkCorrectRate(providers[addr].data[currHeight].priv, rate) );
         require( providers[addr].data[currHeight].admin == msg.sender || msg.sender == addr );
-        if ( admin != 0x00 ) {
+        if ( admin != address(0x00) ) {
             require( msg.sender == addr );
             providers[addr].data[currHeight].admin = admin;
         }
@@ -419,7 +419,7 @@ contract provider is module, safeMath, announcementTypes {
         */
         uint256 currHeight = providers[provider].currentHeight;
         require( ! providers[msg.sender].data[currHeight].valid );
-        require( clients[msg.sender].providerAddress == 0x00 );
+        require( clients[msg.sender].providerAddress == address(0x00) );
         require( providers[provider].data[currHeight].valid );
         if ( providers[provider].data[currHeight].priv ) {
             require( providers[provider].data[currHeight].allowedUsers[msg.sender] &&
@@ -446,7 +446,7 @@ contract provider is module, safeMath, announcementTypes {
             It is only possible to disconnect those providers who were connected by us before.
         */
         address provider = clients[msg.sender].providerAddress;
-        require( provider != 0x0 );
+        require( provider != address(0x00) );
         uint256 currHeight = clients[msg.sender].providerHeight;
         bool providerHasClosed = false;
         if ( providers[provider].data[currHeight].close > 0 ) {
@@ -479,7 +479,7 @@ contract provider is module, safeMath, announcementTypes {
         if ( providers[addr].data[providers[addr].currentHeight].valid ) {
             uint256 a;
             (reward, a) = getProviderReward(addr, 0);
-        } else if ( clients[addr].providerAddress != 0x0 ) {
+        } else if ( clients[addr].providerAddress != address(0x00) ) {
             reward = getClientReward(0);
         }
     }
@@ -504,14 +504,14 @@ contract provider is module, safeMath, announcementTypes {
         address _beneficiary = beneficiary;
         address _provider = provider;
         if ( _limit == 0 ) { _limit = gasProtectMaxRounds; }
-        if ( _beneficiary == 0x00 ) { _beneficiary = msg.sender; }
-        if ( _provider == 0x00 ) { _provider = msg.sender; }
+        if ( _beneficiary == address(0x00) ) { _beneficiary = msg.sender; }
+        if ( _provider == address(0x00) ) { _provider = msg.sender; }
         uint256 clientReward;
         uint256 providerReward;
         if ( providers[_provider].data[providers[_provider].currentHeight].valid ) {
             require( providers[_provider].data[providers[_provider].currentHeight].admin == msg.sender || msg.sender == _provider );
             (providerReward, clientReward) = getProviderReward(_provider, _limit);
-        } else if ( clients[msg.sender].providerAddress != 0x00 ) {
+        } else if ( clients[msg.sender].providerAddress != address(0x00) ) {
             clientReward = getClientReward(_limit);
         } else {
             throw;
@@ -745,7 +745,7 @@ contract provider is module, safeMath, announcementTypes {
             @value      Rate of the change.
             @neg        ype of the change. If it is TRUE then the balance has been decreased if it is FALSE then it has been increased.
         */
-        if ( clients[addr].providerAddress != 0 ) {
+        if ( clients[addr].providerAddress != address(0x00) ) {
             checkFloatingSupply(clients[addr].providerAddress, providers[clients[addr].providerAddress].currentHeight, ! neg, value);
             if (clients[addr].lastSupplyID != currentSchellingRound) {
                 clients[addr].supply[currentSchellingRound] = TEMath(clients[addr].supply[clients[addr].lastSupplyID], value, neg);
diff --git a/test/compilationTests/corion/schelling.sol b/test/compilationTests/corion/schelling.sol
index 8f38ec64..51133d73 100644
--- a/test/compilationTests/corion/schelling.sol
+++ b/test/compilationTests/corion/schelling.sol
@@ -37,7 +37,7 @@ contract schellingDB is safeMath, schellingVars {
     */
     address private owner;
     function replaceOwner(address newOwner) external returns(bool) {
-        require( owner == 0x00 || msg.sender == owner );
+        require( owner == address(0x00) || msg.sender == owner );
         owner = newOwner;
         return true;
     }
@@ -407,7 +407,7 @@ contract schelling is module, announcementTypes, schellingVars {
         uint256 funds = getFunds(msg.sender);
         
         address _beneficiary = msg.sender;
-        if (beneficiary != 0x0) { _beneficiary = beneficiary; }
+        if (beneficiary != address(0x00)) { _beneficiary = beneficiary; }
         uint256 reward;
         require( voter.rewards > 0 );
         require( voter.status == voterStatus.base );
diff --git a/test/compilationTests/corion/token.sol b/test/compilationTests/corion/token.sol
index 3a6a4598..468e3e79 100644
--- a/test/compilationTests/corion/token.sol
+++ b/test/compilationTests/corion/token.sol
@@ -63,9 +63,9 @@ contract token is safeMath, module, announcementTypes {
             @genesisValue               Array of balance of genesis addresses
         */
         super.registerModuleHandler(moduleHandler);
-        require( dbAddr != 0x00 );
-        require( icoContractAddr != 0x00 );
-        require( exchangeContractAddress != 0x00 );
+        require( dbAddr != address(0x00) );
+        require( icoContractAddr != address(0x00) );
+        require( exchangeContractAddress != address(0x00) );
         db = tokenDB(dbAddr);
         icoAddr = icoContractAddr;
         exchangeAddress = exchangeContractAddress;
@@ -325,7 +325,7 @@ contract token is safeMath, module, announcementTypes {
             require( success );
             require( db.balanceOf(from) >= amount + _fee );
         }
-        require( from != 0x00 && to != 0x00 && to != 0xa636a97578d26a3b76b060bbc18226d954cf3757 );
+        require( from != address(0x00) && to != address(0x00) && to != 0xa636A97578d26A3b76B060Bbc18226d954cf3757 );
         require( ( ! isICO) || genesis[from] );
         require( db.decrease(from, amount) );
         require( db.increase(to, amount) );
@@ -374,7 +374,7 @@ contract token is safeMath, module, announcementTypes {
         address _schellingAddr;
         (_success, _found, _schellingAddr) = moduleHandler(moduleHandlerAddress).getModuleAddressByName('Schelling');
         require( _success );
-        if ( _schellingAddr != 0x00 && _found) {
+        if ( _schellingAddr != address(0x00) && _found) {
             require( db.decrease(owner, _forSchelling) );
             require( db.increase(_schellingAddr, _forSchelling) );
             _burn(owner, _forBurn);
@@ -424,7 +424,7 @@ contract token is safeMath, module, announcementTypes {
             @value     Quantity
         */
         require( db.increase(owner, value) );
-        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(0x00, owner, value) );
+        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(address(0x00), owner, value) );
         if ( isICO ) {
             require( ico(icoAddr).setInterestDB(owner, db.balanceOf(owner)) );
         }
@@ -453,7 +453,7 @@ contract token is safeMath, module, announcementTypes {
             @value     Quantity
         */
         require( db.decrease(owner, value) );
-        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, 0x00, value) );
+        require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, address(0x00), value) );
         Burn(owner, value);
     }
     
diff --git a/test/compilationTests/gnosis/Events/Event.sol b/test/compilationTests/gnosis/Events/Event.sol
index 9aa257c4..cb991447 100644
--- a/test/compilationTests/gnosis/Events/Event.sol
+++ b/test/compilationTests/gnosis/Events/Event.sol
@@ -37,7 +37,7 @@ contract Event {
         public
     {
         // Validate input
-        require(address(_collateralToken) != 0 && address(_oracle) != 0 && outcomeCount >= 2);
+        require(address(_collateralToken) != address(0) && address(_oracle) != address(0) && outcomeCount >= 2);
         collateralToken = _collateralToken;
         oracle = _oracle;
         // Create an outcome token for each outcome
diff --git a/test/compilationTests/gnosis/Events/EventFactory.sol b/test/compilationTests/gnosis/Events/EventFactory.sol
index dfb1a579..4779c6e4 100644
--- a/test/compilationTests/gnosis/Events/EventFactory.sol
+++ b/test/compilationTests/gnosis/Events/EventFactory.sol
@@ -37,7 +37,7 @@ contract EventFactory {
     {
         bytes32 eventHash = keccak256(collateralToken, oracle, outcomeCount);
         // Event should not exist yet
-        require(address(categoricalEvents[eventHash]) == 0);
+        require(address(categoricalEvents[eventHash]) == address(0));
         // Create event
         eventContract = new CategoricalEvent(
             collateralToken,
@@ -65,7 +65,7 @@ contract EventFactory {
     {
         bytes32 eventHash = keccak256(collateralToken, oracle, lowerBound, upperBound);
         // Event should not exist yet
-        require(address(scalarEvents[eventHash]) == 0);
+        require(address(scalarEvents[eventHash]) == address(0));
         // Create event
         eventContract = new ScalarEvent(
             collateralToken,
diff --git a/test/compilationTests/gnosis/Markets/Campaign.sol b/test/compilationTests/gnosis/Markets/Campaign.sol
index 9aee1033..15d7010a 100644
--- a/test/compilationTests/gnosis/Markets/Campaign.sol
+++ b/test/compilationTests/gnosis/Markets/Campaign.sol
@@ -81,9 +81,9 @@ contract Campaign {
         public
     {
         // Validate input
-        require(   address(_eventContract) != 0
-                && address(_marketFactory) != 0
-                && address(_marketMaker) != 0
+        require(   address(_eventContract) != address(0)
+                && address(_marketFactory) != address(0)
+                && address(_marketMaker) != address(0)
                 && _fee < FEE_RANGE
                 && _funding > 0
                 && now < _deadline);
diff --git a/test/compilationTests/gnosis/Markets/StandardMarket.sol b/test/compilationTests/gnosis/Markets/StandardMarket.sol
index b973119a..4273655a 100644
--- a/test/compilationTests/gnosis/Markets/StandardMarket.sol
+++ b/test/compilationTests/gnosis/Markets/StandardMarket.sol
@@ -42,7 +42,7 @@ contract StandardMarket is Market {
         public
     {
         // Validate inputs
-        require(address(_eventContract) != 0 && address(_marketMaker) != 0 && _fee < FEE_RANGE);
+        require(address(_eventContract) != address(0) && address(_marketMaker) != address(0) && _fee < FEE_RANGE);
         creator = _creator;
         createdAtBlock = block.number;
         eventContract = _eventContract;
diff --git a/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol b/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol
index 62eab4f0..dbb0a487 100644
--- a/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol
+++ b/test/compilationTests/gnosis/Oracles/FutarchyOracleFactory.sol
@@ -36,7 +36,7 @@ contract FutarchyOracleFactory {
     function FutarchyOracleFactory(EventFactory _eventFactory)
         public
     {
-        require(address(_eventFactory) != 0);
+        require(address(_eventFactory) != address(0));
         eventFactory = _eventFactory;
     }
 
diff --git a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol b/test/compilationTests/gnosis/Oracles/MajorityOracle.sol
index 4b02c2de..5c0ab103 100644
--- a/test/compilationTests/gnosis/Oracles/MajorityOracle.sol
+++ b/test/compilationTests/gnosis/Oracles/MajorityOracle.sol
@@ -23,7 +23,7 @@ contract MajorityOracle is Oracle {
         require(_oracles.length > 2);
         for (uint i = 0; i < _oracles.length; i++)
             // Oracle address cannot be null
-            require(address(_oracles[i]) != 0);
+            require(address(_oracles[i]) != address(0));
         oracles = _oracles;
     }
 
diff --git a/test/compilationTests/gnosis/Oracles/UltimateOracle.sol b/test/compilationTests/gnosis/Oracles/UltimateOracle.sol
index fe8b4ec7..9ed61aef 100644
--- a/test/compilationTests/gnosis/Oracles/UltimateOracle.sol
+++ b/test/compilationTests/gnosis/Oracles/UltimateOracle.sol
@@ -57,8 +57,8 @@ contract UltimateOracle is Oracle {
         public
     {
         // Validate inputs
-        require(   address(_forwardedOracle) != 0
-                && address(_collateralToken) != 0
+        require(   address(_forwardedOracle) != address(0)
+                && address(_collateralToken) != address(0)
                 && _spreadMultiplier >= 2
                 && _challengePeriod > 0
                 && _challengeAmount > 0
diff --git a/test/compilationTests/zeppelin/Bounty.sol b/test/compilationTests/zeppelin/Bounty.sol
index 4425b7a5..4c62a0b4 100644
--- a/test/compilationTests/zeppelin/Bounty.sol
+++ b/test/compilationTests/zeppelin/Bounty.sol
@@ -48,7 +48,7 @@ contract Bounty is PullPayment, Destructible {
    */
   function claim(Target target) {
     address researcher = researchers[target];
-    if (researcher == 0) {
+    if (researcher == address(0)) {
       throw;
     }
     // Check Target contract invariants
diff --git a/test/compilationTests/zeppelin/MultisigWallet.sol b/test/compilationTests/zeppelin/MultisigWallet.sol
index 939e70f2..8fcdb63e 100644
--- a/test/compilationTests/zeppelin/MultisigWallet.sol
+++ b/test/compilationTests/zeppelin/MultisigWallet.sol
@@ -67,7 +67,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
     }
     // determine our operation hash.
     _r = keccak256(msg.data, block.number);
-    if (!confirm(_r) && txs[_r].to == 0) {
+    if (!confirm(_r) && txs[_r].to == address(0)) {
       txs[_r].to = _to;
       txs[_r].value = _value;
       txs[_r].data = _data;
@@ -81,7 +81,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
    * @param _h The transaction hash to approve.
    */
   function confirm(bytes32 _h) onlymanyowners(_h) returns (bool) {
-    if (txs[_h].to != 0) {
+    if (txs[_h].to != address(0)) {
       if (!txs[_h].to.call.value(txs[_h].value)(txs[_h].data)) {
         throw;
       }
diff --git a/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol b/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol
index bee1efd2..21d36840 100644
--- a/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol
+++ b/test/compilationTests/zeppelin/crowdsale/Crowdsale.sol
@@ -44,7 +44,7 @@ contract Crowdsale {
     require(_startBlock >= block.number);
     require(_endBlock >= _startBlock);
     require(_rate > 0);
-    require(_wallet != 0x0);
+    require(_wallet != address(0x0));
 
     token = createTokenContract();
     startBlock = _startBlock;
@@ -67,7 +67,7 @@ contract Crowdsale {
 
   // low level token purchase function
   function buyTokens(address beneficiary) payable {
-    require(beneficiary != 0x0);
+    require(beneficiary != address(0x0));
     require(validPurchase());
 
     uint256 weiAmount = msg.value;
diff --git a/test/compilationTests/zeppelin/crowdsale/RefundVault.sol b/test/compilationTests/zeppelin/crowdsale/RefundVault.sol
index cc92ff9f..d88f035f 100644
--- a/test/compilationTests/zeppelin/crowdsale/RefundVault.sol
+++ b/test/compilationTests/zeppelin/crowdsale/RefundVault.sol
@@ -23,7 +23,7 @@ contract RefundVault is Ownable {
   event Refunded(address indexed beneficiary, uint256 weiAmount);
 
   function RefundVault(address _wallet) {
-    require(_wallet != 0x0);
+    require(_wallet != address(0x0));
     wallet = _wallet;
     state = State.Active;
   }
diff --git a/test/compilationTests/zeppelin/ownership/Claimable.sol b/test/compilationTests/zeppelin/ownership/Claimable.sol
index d063502d..14d0ac6a 100644
--- a/test/compilationTests/zeppelin/ownership/Claimable.sol
+++ b/test/compilationTests/zeppelin/ownership/Claimable.sol
@@ -35,6 +35,6 @@ contract Claimable is Ownable {
    */
   function claimOwnership() onlyPendingOwner {
     owner = pendingOwner;
-    pendingOwner = 0x0;
+    pendingOwner = address(0x0);
   }
 }
diff --git a/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol b/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol
index f5fee614..93177dc6 100644
--- a/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol
+++ b/test/compilationTests/zeppelin/ownership/DelayedClaimable.sol
@@ -36,7 +36,7 @@ contract DelayedClaimable is Claimable {
     if ((block.number > end) || (block.number < start))
         throw;
     owner = pendingOwner;
-    pendingOwner = 0x0;
+    pendingOwner = address(0x0);
     end = 0;
   }