arnaucube
arnaucube/hermez-nodePublic Self-hosted repository
Merge pull request #387 from hermeznetwork/feature/fix-get-best-bid-coord

Fix historyDB GetBestBidCoordinator
Eduard S eduard@iden3.io
Fri, 18 Dec 2020 17:53:34 +0100
commit

92e34fb68352792ae98d0dd91b0b77a26f858773

parent

0bde608a1b40d18cf1d2afdd61070a72f03ab1aa

2 files changed, 11 insertions(+), 3 deletions(-)

jump to
M db/historydb/historydb.go → db/historydb/historydb.go

@@ -377,7 +377,7 @@ bidCoord := &common.BidCoordinator{}

err := meddler.QueryRow( hdb.db, bidCoord, `SELECT ( - SELECT default_slot_set_bid_slot_num + SELECT default_slot_set_bid FROM auction_vars WHERE default_slot_set_bid_slot_num <= $1 ORDER BY eth_block_num DESC LIMIT 1
M db/historydb/historydb_test.go → db/historydb/historydb_test.go

@@ -912,7 +912,8 @@ },

} err = historyDB.addCoordinators(historyDB.db, coords) require.NoError(t, err) - err = historyDB.addBids(historyDB.db, []common.Bid{ + + bids := []common.Bid{ { SlotNum: 10, BidValue: big.NewInt(10),

@@ -925,7 +926,9 @@ BidValue: big.NewInt(20),

EthBlockNum: 2, Bidder: coords[1].Bidder, }, - }) + } + + err = historyDB.addBids(historyDB.db, bids) require.NoError(t, err) forger10, err := historyDB.GetBestBidCoordinator(10)

@@ -933,6 +936,11 @@ require.NoError(t, err)

require.Equal(t, coords[1].Forger, forger10.Forger) require.Equal(t, coords[1].Bidder, forger10.Bidder) require.Equal(t, coords[1].URL, forger10.URL) + require.Equal(t, bids[1].SlotNum, forger10.SlotNum) + require.Equal(t, bids[1].BidValue, forger10.BidValue) + for i := range forger10.DefaultSlotSetBid { + require.Equal(t, auction.DefaultSlotSetBid[i], forger10.DefaultSlotSetBid[i]) + } _, err = historyDB.GetBestBidCoordinator(11) require.Equal(t, sql.ErrNoRows, tracerr.Unwrap(err))