Merge branch 'beta' into dev

2018-09-07 03:53:41 -11:00
parent e5714cac7b b721586dd5
commit d6f91d8b96
8 changed files with 183 additions and 2 deletions
--- a/qa/rpc-tests/cryptoconditions.py
+++ b/qa/rpc-tests/cryptoconditions.py
@@ -422,7 +422,6 @@ class CryptoConditionsTest (BitcoinTestFramework):
        result = rpc.tokenbid("100", "deadbeef", "1")
        assert_error(result)

-        # valid bid
        tokenbid = rpc.tokenbid("100", tokenid, "10")
        tokenbidhex = tokenbid['hex']
        tokenbidid = self.send_and_mine(tokenbid['hex'])
@@ -595,6 +594,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()