Merge branch 'master' into td-strict-config

2018-01-03 11:07:08 +01:00
parent e439eae54f e114b0b28d
commit 56311cf0b5
16 changed files with 124 additions and 100 deletions
--- a/parity/cli/tests/config.toml
+++ b/parity/cli/tests/config.toml
@@ -63,7 +63,7 @@ tx_queue_gas = "off"
 tracing = "on"
 pruning = "fast"
 pruning_history = 64
-cache_size_db = 128
+cache_size_db = 256
 cache_size_blocks = 16
 cache_size_queue = 100
 cache_size_state = 25