Merge branch 'master' into beta

2018-08-24 09:00:53 -11:00
parent ca55a65ed6 651cc7598a
commit d0102c55fa
8 changed files with 183 additions and 2 deletions
--- a/qa/rpc-tests/cryptoconditions.py
+++ b/qa/rpc-tests/cryptoconditions.py
@@ -273,7 +273,6 @@ class CryptoConditionsTest (BitcoinTestFramework):
        result = rpc.tokenbid("100", "deadbeef", "1")
        assert_equal(result['error'], 'invalid parameter')

-        # valid bid
        tokenbid = rpc.tokenbid("100", tokenid, "10")
        tokenbidhex = tokenbid['hex']
        tokenbidid = self.send_and_mine(tokenbid['hex'])
@@ -429,6 +428,7 @@ class CryptoConditionsTest (BitcoinTestFramework):
        print("Importing privkey")
        rpc.importprivkey(self.privkey)

+#       self.run_faucet_tests()
        self.run_rewards_tests()
        self.run_dice_tests()
        self.run_token_tests()