NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename MerkleProof.verifyProof to MerkleProof.verify (#1294)

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-06 21:48:04 -03:00
committed by GitHub
parent a7ee54e199
commit df1fab540e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/cryptography/MerkleProof.sol
View File

@ -14,7 +14,7 @@ library MerkleProof {
* @param _root Merkle root * @param _root Merkle root
* @param _leaf Leaf of Merkle tree * @param _leaf Leaf of Merkle tree
*/ */
function verifyProof( function verify(
bytes32[] _proof, bytes32[] _proof,
bytes32 _root, bytes32 _root,
bytes32 _leaf bytes32 _leaf

4
contracts/mocks/MerkleProofWrapper.sol
View File

@ -5,7 +5,7 @@ import { MerkleProof } from "../cryptography/MerkleProof.sol";
contract MerkleProofWrapper { contract MerkleProofWrapper {
function verifyProof( function verify(
bytes32[] _proof, bytes32[] _proof,
bytes32 _root, bytes32 _root,
bytes32 _leaf bytes32 _leaf
@ -14,6 +14,6 @@ contract MerkleProofWrapper {
pure pure
returns (bool) returns (bool)
{ {
return MerkleProof.verifyProof(_proof, _root, _leaf); return MerkleProof.verify(_proof, _root, _leaf);
} }
} }

8
test/library/MerkleProof.test.js
View File

@ -13,7 +13,7 @@ contract('MerkleProof', function () {
merkleProof = await MerkleProofWrapper.new(); merkleProof = await MerkleProofWrapper.new();
}); });
describe('verifyProof', function () { describe('verify', function () {
it('should return true for a valid Merkle proof', async function () { it('should return true for a valid Merkle proof', async function () {
const elements = ['a', 'b', 'c', 'd']; const elements = ['a', 'b', 'c', 'd'];
const merkleTree = new MerkleTree(elements); const merkleTree = new MerkleTree(elements);
@ -24,7 +24,7 @@ contract('MerkleProof', function () {
const leaf = bufferToHex(sha3(elements[0])); const leaf = bufferToHex(sha3(elements[0]));
(await merkleProof.verifyProof(proof, root, leaf)).should.equal(true); (await merkleProof.verify(proof, root, leaf)).should.equal(true);
}); });
it('should return false for an invalid Merkle proof', async function () { it('should return false for an invalid Merkle proof', async function () {
@ -40,7 +40,7 @@ contract('MerkleProof', function () {
const badProof = badMerkleTree.getHexProof(badElements[0]); const badProof = badMerkleTree.getHexProof(badElements[0]);
(await merkleProof.verifyProof(badProof, correctRoot, correctLeaf)).should.equal(false); (await merkleProof.verify(badProof, correctRoot, correctLeaf)).should.equal(false);
}); });
it('should return false for a Merkle proof of invalid length', async function () { it('should return false for a Merkle proof of invalid length', async function () {
@ -54,7 +54,7 @@ contract('MerkleProof', function () {
const leaf = bufferToHex(sha3(elements[0])); const leaf = bufferToHex(sha3(elements[0]));
(await merkleProof.verifyProof(badProof, root, leaf)).should.equal(false); (await merkleProof.verify(badProof, root, leaf)).should.equal(false);
}); });
}); });
}); });