Raise ValueError when commitment is not a string

This commit is contained in:
Jay Graber 2017-10-19 11:03:34 -07:00
parent 9f2147b01f
commit cd9ae67750
2 changed files with 4 additions and 4 deletions

View File

@ -67,8 +67,6 @@ class bitcoinProxy():
def get_keys(self, funder_address, redeemer_address):
fundpubkey = CBitcoinAddress(funder_address)
redeempubkey = CBitcoinAddress(redeemer_address)
# fundpubkey = self.bitcoind.getnewaddress()
# redeempubkey = self.bitcoind.getnewaddress()
return fundpubkey, redeempubkey
def privkey(self, address):
@ -79,7 +77,8 @@ class bitcoinProxy():
redeemerAddr = CBitcoinAddress(redeemer)
if type(commitment) == str:
commitment = x(commitment)
# h = sha256(secret)
else:
raise ValueError("Commitment was not a string: {0}".format(commitment))
blocknum = self.bitcoind.getblockcount()
print("Current blocknum on Bitcoin: ", blocknum)
redeemblocknum = blocknum + locktime

View File

@ -53,7 +53,8 @@ class zcashProxy():
redeemerAddr = CBitcoinAddress(redeemer)
if type(commitment) == str:
commitment = x(commitment)
# h = sha256(secret)
else:
raise ValueError("Commitment was not a string: {0}".format(commitment))
blocknum = self.zcashd.getblockcount()
print("Current blocknum on Zcash: ", blocknum)
redeemblocknum = blocknum + locktime