Fixes #6515.
The rpc_addmultisig test was failing because cs_wallet was locked prior to rpc functions, upsetting the locking order.
The rpc_wallet test wasn't failing, but I dropped the lock on cs_wallet for consistency.
Fix test locking issues and un-revert the probable-deadlines assertions commit #6534
pull theuni wants to merge 2 commits into bitcoin:master from theuni:lock-fix changing 2 files +59 −29-
theuni commented at 8:49 PM on August 7, 2015: member
-
locks: don't lock cs_wallet before making rpc calls 605433ffb5
-
9493803f4a
Revert "Revert "Assert on probable deadlocks if the second lock isnt try_lock""
This reverts commit a4fe57da6207c1e5691a1e843d22db571f3f0186. The issue here should be fixed by the previous commit.
-
laanwj commented at 3:36 PM on August 10, 2015: member
ACK
- laanwj merged this on Aug 10, 2015
- laanwj closed this on Aug 10, 2015
- laanwj referenced this in commit 6c1c7fdfd6 on Aug 10, 2015
- DrahtBot locked this on Sep 8, 2021
