Raise ValueError when commitment is not a string
This commit is contained in:
parent
9f2147b01f
commit
cd9ae67750
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue