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

Use flags for effective amounts in SQL schema

Browse Source
This commit is contained in:
Arnau B
2020-12-03 17:32:45 +01:00
parent 3e3eb3ffe6
commit 5fd258ee07
8 changed files with 100 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
db/historydb/historydb_test.go
View File

@@ -598,7 +598,7 @@ func TestExitTree(t *testing.T) {
assert.NoError(t, err)
}
func TestGetL1UserTxs(t *testing.T) {
func TestGetUnforgedL1UserTxs(t *testing.T) {
test.WipeDB(historyDB.DB())
set := `
@@ -629,13 +629,13 @@ func TestGetL1UserTxs(t *testing.T) {
require.Nil(t, err)
}
l1UserTxs, err := historyDB.GetL1UserTxs(toForgeL1TxsNum)
l1UserTxs, err := historyDB.GetUnforgedL1UserTxs(toForgeL1TxsNum)
require.Nil(t, err)
assert.Equal(t, 5, len(l1UserTxs))
assert.Equal(t, blocks[0].Rollup.L1UserTxs, l1UserTxs)
// No l1UserTxs for this toForgeL1TxsNum
l1UserTxs, err = historyDB.GetL1UserTxs(2)
l1UserTxs, err = historyDB.GetUnforgedL1UserTxs(2)
require.Nil(t, err)
assert.Equal(t, 0, len(l1UserTxs))
}
@@ -728,6 +728,13 @@ func TestSetL1UserTxEffectiveAmounts(t *testing.T) {
err = historyDB.AddBlockSCData(&blocks[i])
require.Nil(t, err)
}
// Add second batch to trigger the update of the batch_num,
// while avoiding the implicit call of setL1UserTxEffectiveAmounts
err = historyDB.addBlock(historyDB.db, &blocks[1].Block)
assert.NoError(t, err)
err = historyDB.addBatch(historyDB.db, &blocks[1].Rollup.Batches[0].Batch)
assert.NoError(t, err)
require.Nil(t, err)
// Set the Effective{Amount,LoadAmount} of the L1UserTxs that are forged in the second block
l1Txs := blocks[1].Rollup.Batches[0].L1UserTxs
@@ -741,7 +748,8 @@ func TestSetL1UserTxEffectiveAmounts(t *testing.T) {
dbL1Txs, err := historyDB.GetAllL1UserTxs()
require.NoError(t, err)
for _, tx := range dbL1Txs {
for i, tx := range dbL1Txs {
log.Infof("%d %v %v", i, tx.EffectiveAmount, tx.EffectiveLoadAmount)
assert.NotNil(t, tx.EffectiveAmount)
assert.NotNil(t, tx.EffectiveLoadAmount)
switch tx.TxID {