diff options
| author | Janos Guljas <janos@resenje.org> | 2017-12-13 17:23:11 +0800 |
|---|---|---|
| committer | Janos Guljas <janos@resenje.org> | 2017-12-13 17:40:39 +0800 |
| commit | 19982f946735948478b6b7e7706f1b615f171d0d (patch) | |
| tree | cbacbdb6f9e6e731c2ebc17bad74e875f4d8ea8b /les/handler_test.go | |
| parent | 1dc19de5da64962a98a37bbc7b93a3895d2eb6e6 (diff) | |
| parent | 32516c768ec09e2a71cab5983d2c8b8ae5d92fc7 (diff) | |
| download | dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.gz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.bz2 dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.lz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.xz dexon-19982f946735948478b6b7e7706f1b615f171d0d.tar.zst dexon-19982f946735948478b6b7e7706f1b615f171d0d.zip | |
swarm, cmd/swarm: Merge branch 'master' into multiple-ens-endpoints
Merge with changes that implement config file PR #15548.
Field *EnsApi string* in swarm/api.Config is replaced with
*EnsAPIs []string*.
A new field *EnsDisabled bool* is added to swarm/api.Config for
easy way to disable ENS resolving with config file.
Signature of function swarm.NewSwarm is changed and simplified.
Diffstat (limited to 'les/handler_test.go')
| -rw-r--r-- | les/handler_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/les/handler_test.go b/les/handler_test.go index 9e63e15a6..a9dac89b4 100644 --- a/les/handler_test.go +++ b/les/handler_test.go @@ -416,7 +416,9 @@ func TestTransactionStatusLes2(t *testing.T) { db, _ := ethdb.NewMemDatabase() pm := newTestProtocolManagerMust(t, false, 0, nil, nil, nil, db) chain := pm.blockchain.(*core.BlockChain) - txpool := core.NewTxPool(core.DefaultTxPoolConfig, params.TestChainConfig, chain) + config := core.DefaultTxPoolConfig + config.Journal = "" + txpool := core.NewTxPool(config, params.TestChainConfig, chain) pm.txpool = txpool peer, _ := newTestPeer(t, "peer", 2, pm, true) defer peer.close() |