Merge branch 'master' into v2.0-testnet

Conflux-Chain · Jun 29, 2022 · 84bc6b0 · 84bc6b0
2 parents d89f5df + 189f8a0
commit 84bc6b0
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/client/src/configuration.rs b/client/src/configuration.rs
@@ -888,10 +888,7 @@ impl Configuration {
                 conf.additional_maintained_trace_epoch_count = Some(0);
             }
         }
-        if conf
-            .additional_maintained_transaction_index_epoch_count
-            .is_some()
-        {
+        if conf.additional_maintained_transaction_index_epoch_count != Some(0) {
             conf.persist_tx_index = true;
         }
         conf