diff options
Diffstat (limited to 'core/tx_pool_test.go')
| -rw-r--r-- | core/tx_pool_test.go | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 2cc6c7903..4c1d78f7f 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -87,7 +87,7 @@ func setupTxPool() (*TxPool, *ecdsa.PrivateKey) { blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} key, _ := crypto.GenerateKey() - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) return pool, key } @@ -197,7 +197,7 @@ func TestStateChangeDuringTransactionPoolReset(t *testing.T) { tx0 := transaction(0, 100000, key) tx1 := transaction(1, 100000, key) - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() nonce := pool.State().GetNonce(address) @@ -562,7 +562,7 @@ func TestTransactionPostponing(t *testing.T) { statedb, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase())) blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create two test accounts to produce different gap profiles with @@ -781,7 +781,7 @@ func testTransactionQueueGlobalLimiting(t *testing.T, nolocals bool) { config.NoLocals = nolocals config.GlobalQueue = config.AccountQueue*3 - 1 // reduce the queue limits to shorten test time (-1 to make it non divisible) - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create a number of test accounts and fund them (last one will be the local) @@ -869,7 +869,7 @@ func testTransactionQueueTimeLimiting(t *testing.T, nolocals bool) { config.Lifetime = time.Second config.NoLocals = nolocals - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create two test accounts to ensure remotes expire but locals do not @@ -1022,7 +1022,7 @@ func TestTransactionPendingGlobalLimiting(t *testing.T) { config := testTxPoolConfig config.GlobalSlots = config.AccountSlots * 10 - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create a number of test accounts and fund them @@ -1070,7 +1070,7 @@ func TestTransactionCapClearsFromAll(t *testing.T) { config.AccountQueue = 2 config.GlobalSlots = 8 - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create a number of test accounts and fund them @@ -1102,7 +1102,7 @@ func TestTransactionPendingMinimumAllowance(t *testing.T) { config := testTxPoolConfig config.GlobalSlots = 1 - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create a number of test accounts and fund them @@ -1147,7 +1147,7 @@ func TestTransactionPoolRepricing(t *testing.T) { statedb, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase())) blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() // Keep track of transaction events to ensure all executables get announced @@ -1268,7 +1268,7 @@ func TestTransactionPoolRepricingKeepsLocals(t *testing.T) { statedb, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase())) blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create a number of test accounts and fund them @@ -1334,7 +1334,7 @@ func TestTransactionPoolUnderpricing(t *testing.T) { config.GlobalSlots = 2 config.GlobalQueue = 2 - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Keep track of transaction events to ensure all executables get announced @@ -1440,7 +1440,7 @@ func TestTransactionPoolStableUnderpricing(t *testing.T) { config.GlobalSlots = 128 config.GlobalQueue = 0 - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) defer pool.Stop() // Keep track of transaction events to ensure all executables get announced @@ -1502,7 +1502,7 @@ func TestTransactionReplacement(t *testing.T) { statedb, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase())) blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() // Keep track of transaction events to ensure all executables get announced @@ -1601,7 +1601,7 @@ func testTransactionJournaling(t *testing.T, nolocals bool) { config.Journal = journal config.Rejournal = time.Second - pool := NewTxPool(config, params.TestChainConfig, blockchain) + pool := NewTxPool(config, params.TestChainConfig, blockchain, false) // Create two test accounts to ensure remotes expire but locals do not local, _ := crypto.GenerateKey() @@ -1638,7 +1638,7 @@ func testTransactionJournaling(t *testing.T, nolocals bool) { statedb.SetNonce(crypto.PubkeyToAddress(local.PublicKey), 1) blockchain = &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool = NewTxPool(config, params.TestChainConfig, blockchain) + pool = NewTxPool(config, params.TestChainConfig, blockchain, false) pending, queued = pool.Stats() if queued != 0 { @@ -1664,7 +1664,7 @@ func testTransactionJournaling(t *testing.T, nolocals bool) { statedb.SetNonce(crypto.PubkeyToAddress(local.PublicKey), 1) blockchain = &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool = NewTxPool(config, params.TestChainConfig, blockchain) + pool = NewTxPool(config, params.TestChainConfig, blockchain, false) pending, queued = pool.Stats() if pending != 0 { @@ -1694,7 +1694,7 @@ func TestTransactionStatusCheck(t *testing.T) { statedb, _ := state.New(common.Hash{}, state.NewDatabase(ethdb.NewMemDatabase())) blockchain := &testBlockChain{statedb, 1000000, new(event.Feed), new(event.Feed)} - pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain) + pool := NewTxPool(testTxPoolConfig, params.TestChainConfig, blockchain, false) defer pool.Stop() // Create the test accounts to check various transaction statuses with |