Merge pull request #132 from OpenZeppelin/refactor

Refactor folders in preparation for external audit

contracts/Bounty.sol

 pragma solidity ^0.4.4;
 
 
-import './PullPayment.sol';
-import './Killable.sol';
+import './payment/PullPayment.sol';
+import './lifecycle/Killable.sol';
 
 
 /*

contracts/DayLimit.sol

 pragma solidity ^0.4.4;
 
 
-import './Shareable.sol';
+import './ownership/Shareable.sol';
 
 
 /*

contracts/MultisigWallet.sol

 pragma solidity ^0.4.4;
 
 
-import "./Multisig.sol";
-import "./Shareable.sol";
+import "./ownership/Multisig.sol";
+import "./ownership/Shareable.sol";
 import "./DayLimit.sol";
 
 

contracts/examples/BadArrayUse.sol

-pragma solidity ^0.4.4;
-
-
-import '../PullPayment.sol';
-
-
-// UNSAFE CODE, DO NOT USE!
-contract BadArrayUse is PullPayment {
-  address[] employees;
-
-  function payBonus() {
-    for (var i = 0; i < employees.length; i++) {
-			address employee = employees[i];
-			uint bonus = calculateBonus(employee);
-    	asyncSend(employee, bonus);
-    }
-  }
-
-	function calculateBonus(address employee) returns (uint) {
-    // some expensive computation...
-  }
-
-}

contracts/examples/BadFailEarly.sol

-pragma solidity ^0.4.4;
-
-
-// UNSAFE CODE, DO NOT USE!
-contract BadFailEarly {
-
-  uint constant DEFAULT_SALARY = 50000;
-  mapping(string => uint) nameToSalary;
-
-  function getSalary(string name) constant returns (uint) {
-    if (bytes(name).length != 0 && nameToSalary[name] != 0) {
-      return nameToSalary[name];
-    } else {
-      return DEFAULT_SALARY;
-    }
-  }
-}

contracts/examples/BadPushPayments.sol

-pragma solidity ^0.4.4;
-
-
-// UNSAFE CODE, DO NOT USE!
-contract BadPushPayments {
-
-	address highestBidder;
-	uint highestBid;
-
-	function bid() payable {
-		if (msg.value < highestBid) throw;
-
-		if (highestBidder != 0) {
-      // return bid to previous winner
-			if (!highestBidder.send(highestBid)) {
-        throw;
-      }
-		}
-
-	  highestBidder = msg.sender;
-	  highestBid = msg.value;
-	}
-}

contracts/examples/GoodArrayUse.sol

-pragma solidity ^0.4.4;
-
-
-import '../PullPayment.sol';
-
-
-contract GoodArrayUse is PullPayment {
-  address[] employees;
-  mapping(address => uint) bonuses;
-
-  function payBonus() {
-    for (uint i = 0; i < employees.length; i++) {
-			address employee = employees[i];
-			uint bonus = bonuses[employee];
-    	asyncSend(employee, bonus);
-    }
-  }
-
-	function calculateBonus(address employee) returns (uint) {
-    uint bonus = 0;
-    // some expensive computation...
-    bonuses[employee] = bonus;
-  }
-
-}

contracts/examples/GoodFailEarly.sol

-pragma solidity ^0.4.4;
-
-
-contract GoodFailEarly {
-
-  uint constant DEFAULT_SALARY = 50000;
-  mapping(string => uint) nameToSalary;
-
-  function getSalary(string name) constant returns (uint) {
-    if (bytes(name).length == 0) throw;
-    if (nameToSalary[name] == 0) throw;
-
-    return nameToSalary[name];
-  }
-}

contracts/examples/GoodPullPayments.sol

-pragma solidity ^0.4.4;
-
-
-contract GoodPullPayments {
-  address highestBidder;
-  uint highestBid;
-  mapping(address => uint) refunds;
-
-  function bid() external payable {
-    if (msg.value < highestBid) throw;
-
-    if (highestBidder != 0) {
-      refunds[highestBidder] += highestBid;
-    }
-
-    highestBidder = msg.sender;
-    highestBid = msg.value;
-  }
-
-  function withdrawBid() external {
-    uint refund = refunds[msg.sender];
-    refunds[msg.sender] = 0;
-    if (!msg.sender.send(refund)) {
-      refunds[msg.sender] = refund;
-    }
-  }
-}

contracts/examples/ProofOfExistence.sol

-pragma solidity ^0.4.4;
-
-
-/*
- * Proof of Existence example contract
- * see https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05
- */
-contract ProofOfExistence {
-
-  mapping (bytes32 => bool) public proofs;
-
-  // store a proof of existence in the contract state
-  function storeProof(bytes32 proof) {
-    proofs[proof] = true;
-  }
-
-  // calculate and store the proof for a document
-  function notarize(string document) {
-    var proof = calculateProof(document);
-    storeProof(proof);
-  }
-
-  // helper function to get a document's sha256
-  function calculateProof(string document) constant returns (bytes32) {
-    return sha256(document);
-  }
-
-  // check if a document has been notarized
-  function checkDocument(string document) constant returns (bool) {
-    var proof = calculateProof(document);
-    return hasProof(proof);
-  }
-
-  // returns true if proof is stored
-  function hasProof(bytes32 proof) constant returns (bool) {
-    return proofs[proof];
-  }
-}

contracts/examples/PullPaymentBid.sol

-pragma solidity ^0.4.4;
-
-
-import '../PullPayment.sol';
-
-
-contract PullPaymentBid is PullPayment {
-  address public highestBidder;
-  uint public highestBid;
-  
-  function bid() external payable {
-    if (msg.value <= highestBid) throw;
-    
-    if (highestBidder != 0) {
-      asyncSend(highestBidder, highestBid);
-    }
-    highestBidder = msg.sender;
-    highestBid = msg.value;
-  }
-}

contracts/examples/StoppableBid.sol

-pragma solidity ^0.4.4;
-
-
-import '../PullPayment.sol';
-import '../Stoppable.sol';
-
-
-contract StoppableBid is Stoppable, PullPayment {
-  address public highestBidder;
-  uint public highestBid;
-
-  function bid() external payable stopInEmergency {
-    if (msg.value <= highestBid) throw;
-    
-    if (highestBidder != 0) {
-      asyncSend(highestBidder, highestBid);
-    }
-    highestBidder = msg.sender;
-    highestBid = msg.value;
-  }
-
-  function withdraw() onlyInEmergency {
-    selfdestruct(owner);
-  }
-
-}

contracts/Killable.sol → contracts/lifecycle/Killable.sol

 pragma solidity ^0.4.4;
 
 
-import "./Ownable.sol";
+import "../ownership/Ownable.sol";
 
 
 /*

contracts/Migrations.sol → contracts/lifecycle/Migrations.sol

 pragma solidity ^0.4.4;
 
 
-import './Ownable.sol';
+import '../ownership/Ownable.sol';
 
 
 contract Migrations is Ownable {

contracts/Stoppable.sol → contracts/lifecycle/Stoppable.sol

 pragma solidity ^0.4.4;
 
 
-import "./Ownable.sol";
+import "../ownership/Ownable.sol";
 
 
 /*

contracts/test-helpers/PullPaymentMock.sol

 pragma solidity ^0.4.4;
 
 
-import '../PullPayment.sol';
+import '../payment/PullPayment.sol';
 
 
 // mock class using PullPayment

contracts/test-helpers/ShareableMock.sol

 pragma solidity ^0.4.4;
-import "../Shareable.sol";
+import "../ownership/Shareable.sol";
 
 contract ShareableMock is Shareable {
 

contracts/test-helpers/StoppableMock.sol

 pragma solidity ^0.4.4;
 
 
-import '../Stoppable.sol';
+import '../lifecycle/Stoppable.sol';
 
 
 // mock class using Stoppable

migrations/2_deploy_contracts.js

 module.exports = function(deployer) {
-  deployer.deploy(PullPaymentBid);
-  deployer.deploy(BadArrayUse);
-  deployer.deploy(ProofOfExistence);
   deployer.deploy(Ownable);
   deployer.deploy(Claimable);
   deployer.deploy(LimitBalance);
   if(deployer.network == 'test'){
     deployer.deploy(SecureTargetBounty);
     deployer.deploy(InsecureTargetBounty);
-  };
+  }
 };

test/Killable.js

@@ -7,7 +7,7 @@ contract('Killable', function(accounts) {
     transactionReceiptAsync = function(txnHash, resolve, reject) {
         try {
             var receipt = web3.eth.getTransactionReceipt(txnHash);
-            if (receipt == null) {
+            if (receipt === null) {
                 setTimeout(function () {
                     transactionReceiptAsync(txnHash, resolve, reject);
                 }, interval);
@@ -37,9 +37,6 @@ contract('Killable', function(accounts) {
     web3.eth.sendTransaction({from: web3.eth.coinbase, to: accounts[0], value: web3.toWei('50','ether')}, function(err, result) {
       if(err)
         console.log("ERROR:" + err);
-      else {
-        console.log(result);
-      }
     });
 
     killable = await Killable.new({from: accounts[0], value: web3.toWei('10','ether')});