arnaucube/hermez-node
1
0
Fork 0
mirror of https://github.com/arnaucube/hermez-node.git synced 2026-02-07 03:16:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #484 from hermeznetwork/feature/proofservertest-zki6

Browse Source 
Add ZKInputs test to use ProofServer
This commit is contained in:
Eduard S
2021-01-14 15:13:51 +01:00
committed by GitHub
parent ca6a4a6013 c61a5aa3da
commit 8f6b081f2c
3 changed files with 234 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
txprocessor/txprocessor.go
View File

@@ -283,7 +283,6 @@ func (tp *TxProcessor) ProcessTxs(coordIdxs []common.Idx, l1usertxs, l1coordinat
if tp.i < nTx-1 {
tp.zki.ISOutIdx[tp.i] = tp.s.CurrentIdx().BigInt()
tp.zki.ISStateRoot[tp.i] = tp.s.MT.Root().BigInt()
// tp.zki.ISAccFeeOut[tp.i] = formatAccumulatedFees(collectedFees, tp.zki.FeePlanTokens)
tp.zki.ISAccFeeOut[tp.i] = formatAccumulatedFees(collectedFees, tp.zki.FeePlanTokens, coordIdxs)
if exitIdx == nil {
tp.zki.ISExitRoot[tp.i] = exitTree.Root().BigInt()

7
txprocessor/zkinputsgen_test.go
View File

@@ -786,7 +786,7 @@ func TestZKInputs6(t *testing.T) {
// printZKInputs(t, ptOut.ZKInputs)
log.Debug("block:0 batch:7")
// simulate the PoolL2Txs of the batch6
// simulate the PoolL2Txs of the batch7
batchPoolL2 := `
Type: PoolL2
PoolTransferToEthAddr(1) A-B: 200 (126)
@@ -813,7 +813,7 @@ func TestZKInputs6(t *testing.T) {
// printZKInputs(t, ptOut.ZKInputs)
log.Debug("block:0 batch:8")
// simulate the PoolL2Txs of the batch7
// simulate the PoolL2Txs of the batch8
batchPoolL2 = `
Type: PoolL2
PoolTransfer(0) A-B: 100 (126)
@@ -840,7 +840,7 @@ func TestZKInputs6(t *testing.T) {
// printZKInputs(t, ptOut.ZKInputs)
log.Debug("(batch9) block:1 batch:1")
// simulate the PoolL2Txs of the block1,batch0
// simulate the PoolL2Txs of the batch9
batchPoolL2 = `
Type: PoolL2
PoolTransfer(0) D-A: 300 (126)
@@ -866,7 +866,6 @@ func TestZKInputs6(t *testing.T) {
// printZKInputs(t, ptOut.ZKInputs)
log.Debug("(batch10) block:1 batch:2")
// simulate the PoolL2Txs of the block1,batch0
l1UserTxs = til.L1TxsToCommonL1Txs(tc.Queues[*blocks[1].Rollup.Batches[1].Batch.ForgeL1TxsNum])
l2Txs = []common.PoolL2Tx{}
coordIdxs = []common.Idx{}