From 881869c081aa7be8d8413d26247e4ab61621e51f Mon Sep 17 00:00:00 2001 From: Anton Lysakov Date: Tue, 28 Aug 2018 17:37:31 +0700 Subject: [PATCH] fixed local merge disorder --- qa/rpc-tests/cryptoconditions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/rpc-tests/cryptoconditions.py b/qa/rpc-tests/cryptoconditions.py index c8a78c191..ceb6237fd 100755 --- a/qa/rpc-tests/cryptoconditions.py +++ b/qa/rpc-tests/cryptoconditions.py @@ -142,7 +142,7 @@ class CryptoConditionsTest (BitcoinTestFramework): dice = rpc.diceaddress(self.pubkey) assert_equal(dice['result'], 'success') - for x in ['myCCaddress', 'DiceCCaddress', 'Dicemarker', 'myaddress']: + for x in ['myCCaddress', 'DiceCCaddress', 'Dicemarker', 'myaddress', 'CCaddress']: assert_equal(dice[x][0], 'R') # no dice created yet