Auto merge of #2796 - per-gron:less-verbose-tests, r=daira

Less verbose tests

Fixes #2453 and deduplicates some related code.

diff --cc qa/rpc-tests/paymentdisclosure.py
Simple merge

diff --cc qa/rpc-tests/wallet_protectcoinbase.py
index 5423dcd640ac8cf981970f7733175f5e00e1af2b,90f9653ba57931a1e0a0db2b873e9f891032dbac..25b1e794af2c102d2a7c77a550a4f24f1b2e969b
--- 1/qa/rpc-tests/wallet_protectcoinbase.py
--- 2/qa/rpc-tests/wallet_protectcoinbase.py
+++ b/qa/rpc-tests/wallet_protectcoinbase.py
@@@ -156,11 -141,10 +156,11 @@@ class WalletProtectCoinbaseTest (Bitcoi
          assert_equal("wallet does not allow any change" in errorString, True)
  
          # This send will succeed.  We send two coinbase utxos totalling 20.0 less a fee of 0.00010000, with no change.
 +        shieldvalue = Decimal('20.0') - Decimal('0.0001')
          recipients = []
 -        recipients.append({"address":myzaddr, "amount": Decimal('20.0') - Decimal('0.0001')})
 +        recipients.append({"address":myzaddr, "amount": shieldvalue})
          myopid = self.nodes[0].z_sendmany(mytaddr, recipients)
-         mytxid = self.wait_and_assert_operationid_status(myopid)
+         mytxid = wait_and_assert_operationid_status(self.nodes[0], myopid)
          self.sync_all()
          self.nodes[1].generate(1)
          self.sync_all()
@@@ -202,15 -182,11 +202,15 @@@
          assert_equal(Decimal(resp["private"]), Decimal('19.9999'))
          assert_equal(Decimal(resp["total"]), Decimal('39.9999'))
  
 +        # The Sprout value pool should be unchanged
 +        check_value_pool(self.nodes[0], 'sprout', sproutvalue)
 +
          # convert note to transparent funds
 +        unshieldvalue = Decimal('10.0')
          recipients = []
 -        recipients.append({"address":mytaddr, "amount":Decimal('10.0')})
 +        recipients.append({"address":mytaddr, "amount": unshieldvalue})
          myopid = self.nodes[0].z_sendmany(myzaddr, recipients)
-         mytxid = self.wait_and_assert_operationid_status(myopid)
+         mytxid = wait_and_assert_operationid_status(self.nodes[0], myopid)
          assert(mytxid is not None)
          self.sync_all()