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 #194 from hermeznetwork/feature/txsel-noncesorting0

Browse Source 
Add TxSel Nonce sort. Fix surplus from refactors
This commit is contained in:
Eduard S
2020-10-14 11:45:46 +02:00
committed by GitHub
parent c145147e6e 1a2f769b5d
commit 250f1aa119
7 changed files with 60 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/transakcio/txs.go
View File

@@ -180,11 +180,7 @@ func (tc *TestContext) GenerateBlocks(set string) []BlockData {
if err != nil {
panic(err)
}
nL2Tx, err := nTx.L2Tx()
if err != nil {
panic(err)
}
tx = *nL2Tx
tx = nTx.L2Tx()
tx.BatchNum = common.BatchNum(currBatchNum) // when converted to PoolL2Tx BatchNum parameter is lost
currBatch.L2Txs = append(currBatch.L2Txs, tx)
@@ -201,11 +197,7 @@ func (tc *TestContext) GenerateBlocks(set string) []BlockData {
if err != nil {
panic(err)
}
nL2Tx, err := nTx.L2Tx()
if err != nil {
panic(err)
}
tx = *nL2Tx
tx = nTx.L2Tx()
currBatch.L2Txs = append(currBatch.L2Txs, tx)
case common.TxTypeForceExit:
tx := common.L1Tx{