DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert "some diceCC rpc/tests fixes"

Browse Source 
This reverts commit 286ae11874.
This commit is contained in:
Anton Lysakov
2018-11-08 21:11:26 +06:00
parent c674921ff6
commit 97b1ef6625
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
qa/rpc-tests/cryptoconditions.py
View File

@@ -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"

1
src/cc/dice.cpp
View File

@@ -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 )
{