Fix indentation in MerkleProof.sol and remove mock contract

contracts/MerkleProof.sol

@@ -6,33 +6,33 @@ pragma solidity ^0.4.11;
  * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol
  */
 library MerkleProof {
-    /*
+  /*
-     * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
+   * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
-     * and each pair of pre-images is sorted.
+   * and each pair of pre-images is sorted.
-     * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
+   * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
-     * @param _root Merkle root
+   * @param _root Merkle root
-     * @param _leaf Leaf of Merkle tree
+   * @param _leaf Leaf of Merkle tree
-     */
+   */
-    function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) constant returns (bool) {
+  function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) constant returns (bool) {
-        bytes32 proofElement;
+    bytes32 proofElement;
-        bytes32 computedHash = _leaf;
+    bytes32 computedHash = _leaf;
 
-        for (uint256 i = 32; i <= _proof.length; i += 32) {
+    for (uint256 i = 32; i <= _proof.length; i += 32) {
-            assembly {
+      assembly {
-                // Load the current element of the proof
+        // Load the current element of the proof
-                proofElement := mload(add(_proof, i))
+      proofElement := mload(add(_proof, i))
-            }
+          }
 
-            if (computedHash < proofElement) {
+      if (computedHash < proofElement) {
-                // Hash(current computed hash + current element of the proof)
+        // Hash(current computed hash + current element of the proof)
-                computedHash = sha3(computedHash, proofElement);
+        computedHash = sha3(computedHash, proofElement);
-            } else {
+      } else {
-                // Hash(current element of the proof + current computed hash)
+        // Hash(current element of the proof + current computed hash)
-                computedHash = sha3(proofElement, computedHash);
+        computedHash = sha3(proofElement, computedHash);
-            }
+      }
-        }
-
-        // Check if the computed hash (root) is equal to the provided root
-        return computedHash == _root;
     }
+
+    // Check if the computed hash (root) is equal to the provided root
+    return computedHash == _root;
+  }
 }

test/helpers/MerkleProofMock.sol

@@ -1,12 +0,0 @@
-pragma solidity ^0.4.11;
-
-import '../../contracts/MerkleProof.sol';
-
-contract MerkleProofMock {
-
-  bool public result;
-
-  function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) {
-    result = MerkleProof.verifyProof(_proof, _root, _leaf);
-  }
-}