Merge branch 'master' of https://github.com/zcash/zcash into dev

2018-10-08 17:19:15 -07:00
parent 8682e17a7d
commit c2dc091e40
13 changed files with 570 additions and 48 deletions
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -25,7 +25,8 @@ testScripts=(
    'wallet_mergetoaddress.py'
    'wallet.py'
    'wallet_overwintertx.py'
-#    'wallet_nullifiers.py'
+    'wallet_persistence.py'
+    'wallet_nullifiers.py'
    'wallet_1941.py'
    'wallet_addresses.py'
    'wallet_sapling.py'
@@ -46,7 +47,7 @@ testScripts=(
    'zapwallettxes.py'
    'proxy_test.py'
    'merkle_blocks.py'
-#    'fundrawtransaction.py'
+    'fundrawtransaction.py'
    'signrawtransactions.py'
    'signrawtransaction_offline.py'
    'walletbackup.py'