From 286ae118740a3ea23364377a2b371ab5c1f2e85f Mon Sep 17 00:00:00 2001 From: Anton Lysakov Date: Wed, 7 Nov 2018 23:06:19 +0600 Subject: [PATCH 1/2] some diceCC rpc/tests fixes --- qa/rpc-tests/cryptoconditions.py | 14 +++++++------- src/cc/dice.cpp | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/qa/rpc-tests/cryptoconditions.py b/qa/rpc-tests/cryptoconditions.py index 1d2f68777..f34d46baa 100755 --- a/qa/rpc-tests/cryptoconditions.py +++ b/qa/rpc-tests/cryptoconditions.py @@ -201,19 +201,19 @@ class CryptoConditionsTest (BitcoinTestFramework): assert_error(result) # placing 0 amount bet - result = rpc.dicebet(dicename,diceid,"0","1") + result = rpc.dicebet(dicename,diceid,"0","2") assert_error(result) # placing negative amount bet - result = rpc.dicebet(dicename,diceid,"-1","1") + result = rpc.dicebet(dicename,diceid,"-1","2") assert_error(result) # placing bet more than maxbet - result = rpc.dicebet(dicename,diceid,"900","1") + result = rpc.dicebet(dicename,diceid,"900","2") assert_error(result) # placing bet with amount more than funding - result = rpc.dicebet(dicename,diceid,"3000","1") + result = rpc.dicebet(dicename,diceid,"3000","2") assert_error(result) # placing bet with potential won more than funding @@ -233,15 +233,15 @@ class CryptoConditionsTest (BitcoinTestFramework): assert_error(result) # placing bet with not correct dice name - result = rpc.dicebet("nope",diceid,"100","1") + result = rpc.dicebet("nope",diceid,"100","2") assert_error(result) # placing bet with not correct dice id - result = rpc.dicebet(dicename,self.pubkey,"100","1") + result = rpc.dicebet(dicename,self.pubkey,"100","2") assert_error(result) # valid bet placing - placebet = rpc.dicebet(dicename,diceid,"100","1") + placebet = rpc.dicebet(dicename,diceid,"100","2") betid = self.send_and_mine(placebet["hex"]) assert result, "bet placed" diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index 6d1b5392b..5c9735270 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -1066,6 +1066,7 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet return(""); } if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) + error = "Diceinit error on Dicebet (probably plan not exists or plan name not match)"; return(""); if ( bet < minbet || bet > maxbet || odds > maxodds ) { From 97b1ef662530624fbbe6b2dc5b73707acb87b128 Mon Sep 17 00:00:00 2001 From: Anton Lysakov Date: Thu, 8 Nov 2018 21:11:26 +0600 Subject: [PATCH 2/2] Revert "some diceCC rpc/tests fixes" This reverts commit 286ae118740a3ea23364377a2b371ab5c1f2e85f. --- qa/rpc-tests/cryptoconditions.py | 14 +++++++------- src/cc/dice.cpp | 1 - 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/qa/rpc-tests/cryptoconditions.py b/qa/rpc-tests/cryptoconditions.py index f34d46baa..1d2f68777 100755 --- a/qa/rpc-tests/cryptoconditions.py +++ b/qa/rpc-tests/cryptoconditions.py @@ -201,19 +201,19 @@ class CryptoConditionsTest (BitcoinTestFramework): assert_error(result) # placing 0 amount bet - result = rpc.dicebet(dicename,diceid,"0","2") + result = rpc.dicebet(dicename,diceid,"0","1") assert_error(result) # placing negative amount bet - result = rpc.dicebet(dicename,diceid,"-1","2") + result = rpc.dicebet(dicename,diceid,"-1","1") assert_error(result) # placing bet more than maxbet - result = rpc.dicebet(dicename,diceid,"900","2") + result = rpc.dicebet(dicename,diceid,"900","1") assert_error(result) # placing bet with amount more than funding - result = rpc.dicebet(dicename,diceid,"3000","2") + result = rpc.dicebet(dicename,diceid,"3000","1") assert_error(result) # placing bet with potential won more than funding @@ -233,15 +233,15 @@ class CryptoConditionsTest (BitcoinTestFramework): assert_error(result) # placing bet with not correct dice name - result = rpc.dicebet("nope",diceid,"100","2") + result = rpc.dicebet("nope",diceid,"100","1") assert_error(result) # placing bet with not correct dice id - result = rpc.dicebet(dicename,self.pubkey,"100","2") + result = rpc.dicebet(dicename,self.pubkey,"100","1") assert_error(result) # valid bet placing - placebet = rpc.dicebet(dicename,diceid,"100","2") + placebet = rpc.dicebet(dicename,diceid,"100","1") betid = self.send_and_mine(placebet["hex"]) assert result, "bet placed" diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index f814750db..18a104ff3 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -1073,7 +1073,6 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet return(""); } if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) - error = "Diceinit error on Dicebet (probably plan not exists or plan name not match)"; return(""); if ( bet < minbet || bet > maxbet || odds > maxodds ) {