ledger/eval refactor (algorand#700)

refactor ledger/eval block validation don't do crypto+lsig validation in eval fix sync in backlog executer queue clean up lots of logging to make tests quieter
PhearNet · Jan 22, 2020 · c78ada0 · c78ada0
1 parent 4f4a372
commit c78ada0
Show file tree

Hide file tree

Showing 14 changed files with 217 additions and 108 deletions.
diff --git a/data/ledger_test.go b/data/ledger_test.go
@@ -34,7 +34,6 @@ import (
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/logging/telemetryspec"
 	"github.com/algorand/go-algorand/protocol"
-	"github.com/algorand/go-algorand/util/execpool"
 )
 
 func incaddr(user *basics.Address) {
@@ -70,9 +69,6 @@ func BenchmarkAssemblePayset(b *testing.B) {
 	secrets := make([]*crypto.SignatureSecrets, numUsers)
 	addresses := make([]basics.Address, numUsers)
 
-	backlogPool := execpool.MakeBacklog(nil, 0, execpool.LowPriority, nil)
-	defer backlogPool.Shutdown()
-
 	genesis := make(map[basics.Address]basics.AccountData)
 	for i := 0; i < numUsers; i++ {
 		secret := keypair()
@@ -164,7 +160,7 @@ func BenchmarkAssemblePayset(b *testing.B) {
 		}
 		b.StartTimer()
 		newEmptyBlk := bookkeeping.MakeBlock(prev)
-		eval, err := l.StartEvaluator(newEmptyBlk.BlockHeader, tp, backlogPool)
+		eval, err := l.StartEvaluator(newEmptyBlk.BlockHeader)
 		if err != nil {
 			b.Errorf("could not make proposals at round %d: could not start evaluator: %v", next, err)
 			return

diff --git a/data/pools/transactionPool.go b/data/pools/transactionPool.go
@@ -459,16 +459,6 @@ func (pool *TransactionPool) OnNewBlock(block bookkeeping.Block, delta ledger.St
 	}
 }
 
-// alwaysVerifiedPool implements ledger.VerifiedTxnCache and returns every
-// transaction as verified.
-type alwaysVerifiedPool struct {
-	pool *TransactionPool
-}
-
-func (*alwaysVerifiedPool) Verified(txn transactions.SignedTxn, params verify.Params) bool {
-	return true
-}
-
 func (pool *TransactionPool) addToPendingBlockEvaluatorOnce(txgroup []transactions.SignedTxn) error {
 	r := pool.pendingBlockEvaluator.Round() + pool.numPendingWholeBlocks
 	for _, tx := range txgroup {
@@ -529,7 +519,7 @@ func (pool *TransactionPool) recomputeBlockEvaluator(committedTxIds map[transact
 
 	next := bookkeeping.MakeBlock(prev)
 	pool.numPendingWholeBlocks = 0
-	pool.pendingBlockEvaluator, err = pool.ledger.StartEvaluator(next.BlockHeader, &alwaysVerifiedPool{pool}, nil)
+	pool.pendingBlockEvaluator, err = pool.ledger.StartEvaluator(next.BlockHeader)
 	if err != nil {
 		logging.Base().Warnf("TransactionPool.recomputeBlockEvaluator: cannot start evaluator: %v", err)
 		return

diff --git a/data/pools/transactionPool_test.go b/data/pools/transactionPool_test.go
@@ -102,7 +102,7 @@ func newBlockEvaluator(t TestingT, l *ledger.Ledger) *ledger.BlockEvaluator {
 	require.NoError(t, err)
 
 	next := bookkeeping.MakeBlock(prev)
-	eval, err := l.StartEvaluator(next.BlockHeader, &alwaysVerifiedPool{}, nil)
+	eval, err := l.StartEvaluator(next.BlockHeader)
 	require.NoError(t, err)
 
 	return eval

diff --git a/ledger/accountdb_test.go b/ledger/accountdb_test.go
@@ -160,6 +160,7 @@ func TestAccountDBInit(t *testing.T) {
 	proto := config.Consensus[protocol.ConsensusCurrentVersion]
 
 	dbs := dbOpenTest(t)
+	setDbLogging(t, dbs)
 	defer dbs.close()
 
 	tx, err := dbs.wdb.Handle.Begin()
@@ -180,6 +181,7 @@ func TestAccountDBRound(t *testing.T) {
 	proto := config.Consensus[protocol.ConsensusCurrentVersion]
 
 	dbs := dbOpenTest(t)
+	setDbLogging(t, dbs)
 	defer dbs.close()
 
 	tx, err := dbs.wdb.Handle.Begin()

diff --git a/ledger/acctupdates_test.go b/ledger/acctupdates_test.go
@@ -34,11 +34,15 @@ import (
 type mockLedgerForTracker struct {
 	dbs    dbPair
 	blocks []blockEntry
+	log    logging.Logger
 }
 
 func makeMockLedgerForTracker(t *testing.T) *mockLedgerForTracker {
 	dbs := dbOpenTest(t)
-	return &mockLedgerForTracker{dbs: dbs}
+	dblogger := logging.TestingLog(t)
+	dbs.rdb.SetLogger(dblogger)
+	dbs.wdb.SetLogger(dblogger)
+	return &mockLedgerForTracker{dbs: dbs, log: dblogger}
 }
 
 func (ml *mockLedgerForTracker) close() {
@@ -77,7 +81,7 @@ func (ml *mockLedgerForTracker) trackerDB() dbPair {
 }
 
 func (ml *mockLedgerForTracker) trackerLog() logging.Logger {
-	return logging.Base()
+	return ml.log
 }
 
 func checkAcctUpdates(t *testing.T, au *accountUpdates, base basics.Round, latestRnd basics.Round, accts []map[basics.Address]basics.AccountData, rewards []uint64, proto config.ConsensusParams) {

diff --git a/ledger/archival_test.go b/ledger/archival_test.go
@@ -104,7 +104,8 @@ func TestArchival(t *testing.T) {
 	genesisInitState := getInitState()
 	const inMem = true
 	const archival = true
-	l, err := OpenLedger(logging.Base(), dbName, inMem, genesisInitState, archival)
+	log := logging.TestingLog(t)
+	l, err := OpenLedger(log, dbName, inMem, genesisInitState, archival)
 	require.NoError(t, err)
 	defer l.Close()
 	wl := &wrappedLedger{
@@ -495,7 +496,8 @@ func TestArchivalFromNonArchival(t *testing.T) {
 	const inMem = false // use persistent storage
 	archival := false
 
-	l, err := OpenLedger(logging.Base(), dbPrefix, inMem, genesisInitState, archival)
+	log := logging.TestingLog(t)
+	l, err := OpenLedger(log, dbPrefix, inMem, genesisInitState, archival)
 	require.NoError(t, err)
 	blk := genesisInitState.Block
 
@@ -524,7 +526,7 @@ func TestArchivalFromNonArchival(t *testing.T) {
 	l.Close()
 
 	archival = true
-	l, err = OpenLedger(logging.Base(), dbPrefix, inMem, genesisInitState, archival)
+	l, err = OpenLedger(log, dbPrefix, inMem, genesisInitState, archival)
 	require.NoError(t, err)
 	defer l.Close()
 

diff --git a/ledger/blockdb_test.go b/ledger/blockdb_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"
 	"github.com/algorand/go-algorand/data/bookkeeping"
+	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/protocol"
 )
 
@@ -100,8 +101,15 @@ func checkBlockDB(t *testing.T, tx *sql.Tx, blocks []blockEntry) {
 	require.Error(t, err)
 }
 
+func setDbLogging(t *testing.T, dbs dbPair) {
+	dblogger := logging.TestingLog(t)
+	dbs.rdb.SetLogger(dblogger)
+	dbs.wdb.SetLogger(dblogger)
+}
+
 func TestBlockDBEmpty(t *testing.T) {
 	dbs := dbOpenTest(t)
+	setDbLogging(t, dbs)
 	defer dbs.close()
 
 	tx, err := dbs.wdb.Handle.Begin()
@@ -115,6 +123,7 @@ func TestBlockDBEmpty(t *testing.T) {
 
 func TestBlockDBInit(t *testing.T) {
 	dbs := dbOpenTest(t)
+	setDbLogging(t, dbs)
 	defer dbs.close()
 
 	tx, err := dbs.wdb.Handle.Begin()
@@ -134,6 +143,7 @@ func TestBlockDBInit(t *testing.T) {
 
 func TestBlockDBAppend(t *testing.T) {
 	dbs := dbOpenTest(t)
+	setDbLogging(t, dbs)
 	defer dbs.close()
 
 	tx, err := dbs.wdb.Handle.Begin()