Browse Source

fix miksi.test.ts tree size of test

master
arnaucube 4 years ago
parent
commit
030e200500
3 changed files with 7 additions and 7 deletions
  1. +1
    -0
      .github/workflows/tests.yml
  2. +3
    -5
      src/miksi.ts
  3. +3
    -2
      test/miksi.test.ts

+ 1
- 0
.github/workflows/tests.yml

@ -21,5 +21,6 @@ jobs:
- name: Execute tests - name: Execute tests
run: | run: |
sh ./test-compile-circuits.sh sh ./test-compile-circuits.sh
npm run test
npm run test-circuits npm run test-circuits
npm run test-sc npm run test-sc

+ 3
- 5
src/miksi.ts

@ -10,7 +10,6 @@ const Web3 = require("web3");
// const buildBn128 = require("wasmsnark").buildBn128; // const buildBn128 = require("wasmsnark").buildBn128;
const nLevels = 17;
const coinCode = "0"; // refearing to ETH const coinCode = "0"; // refearing to ETH
const ethAmount = '1'; const ethAmount = '1';
const amount = Web3.utils.toWei(ethAmount, 'ether'); const amount = Web3.utils.toWei(ethAmount, 'ether');
@ -26,12 +25,12 @@ exports.calcCommitment = (key, secret) => {
return commitment; return commitment;
}; };
exports.calcDepositWitness = async (wasm, key, secret, commitments) => {
exports.calcDepositWitness = async (wasm, nLevels, key, secret, commitments) => {
const poseidon = circomlib.poseidon.createHash(6, 8, 57); const poseidon = circomlib.poseidon.createHash(6, 8, 57);
const nullifier = poseidon([key, secret]).toString(); const nullifier = poseidon([key, secret]).toString();
const commitment = poseidon([coinCode, amount, secret, nullifier]).toString(); const commitment = poseidon([coinCode, amount, secret, nullifier]).toString();
console.log("PROVA", poseidon([key, commitment]).toString());
console.log("Commitment", commitment.toString());
// rebuild the tree // rebuild the tree
let tree = await smt.newMemEmptyTrie(); let tree = await smt.newMemEmptyTrie();
@ -79,7 +78,6 @@ exports.calcDepositWitness = async (wasm, key, secret, commitments) => {
"coinCode": coinCode, "coinCode": coinCode,
"amount": amount, "amount": amount,
"secret": secret, "secret": secret,
"nullifier": nullifier,
"oldKey": oldKey, "oldKey": oldKey,
"oldValue": oldValue, "oldValue": oldValue,
"siblingsOld": siblingsOld, "siblingsOld": siblingsOld,
@ -120,7 +118,7 @@ exports.calcDepositWitness = async (wasm, key, secret, commitments) => {
}; };
} }
exports.calcWithdrawWitness = async (wasm, key, secret, commitments, addr) => {
exports.calcWithdrawWitness = async (wasm, nLevels, key, secret, commitments, addr) => {
const poseidon = circomlib.poseidon.createHash(6, 8, 57); const poseidon = circomlib.poseidon.createHash(6, 8, 57);
const nullifier = poseidon([key, secret]).toString(); const nullifier = poseidon([key, secret]).toString();
const commitment = poseidon([coinCode, amount, secret, nullifier]).toString(); const commitment = poseidon([coinCode, amount, secret, nullifier]).toString();

+ 3
- 2
test/miksi.test.ts

@ -8,14 +8,15 @@ describe("deposit test", function () {
this.timeout(200000); this.timeout(200000);
it("Test Deposit", async () => { it("Test Deposit", async () => {
const nLevels = 4;
const secret = "1234567890"; const secret = "1234567890";
const key = 1; const key = 1;
const commitments = []; const commitments = [];
const wasm = await fs.promises.readFile("./build/deposit.wasm");
const wasm = await fs.promises.readFile("./test/build/deposit.wasm");
console.log("w", wasm.length); console.log("w", wasm.length);
const witness = await miksi.calcDepositWitness(wasm, key, secret, commitments);
const witness = await miksi.calcDepositWitness(wasm, nLevels, key, secret, commitments);
// console.log("w", witness); // console.log("w", witness);

Loading…
Cancel
Save