Pull addr validation up into cli.py
This commit is contained in:
parent
41e1c437ec
commit
6f20bdbad0
|
@ -143,6 +143,15 @@ def findtrade(tradeid):
|
|||
print(trade.toJSON())
|
||||
return trade
|
||||
|
||||
def find_role(contract):
|
||||
# When regtest created both addrs on same machine, role is both.
|
||||
if is_myaddr(contract.initiator) and is_myaddr(contract.fulfiller):
|
||||
return 'test'
|
||||
elif is_myaddr(contract.initiator):
|
||||
return 'initiator'
|
||||
else:
|
||||
return 'fulfiller'
|
||||
|
||||
def checktrade(tradeid):
|
||||
print("In checktrade")
|
||||
trade = db.get(tradeid)
|
||||
|
|
|
@ -39,18 +39,6 @@ def jsonformat(trade):
|
|||
'buy': trade.buyContract.__dict__
|
||||
}
|
||||
|
||||
############################################
|
||||
#### Role detection utils ####
|
||||
############################################
|
||||
def find_role(contract):
|
||||
# Obviously when regtest created both addrs on same machine, role is both.
|
||||
if is_myaddr(contract.initiator) and is_myaddr(contract.fulfiller):
|
||||
return 'test'
|
||||
elif is_myaddr(contract.initiator):
|
||||
return 'initiator'
|
||||
else:
|
||||
return 'fulfiller'
|
||||
|
||||
############################################
|
||||
########### Preimage utils #################
|
||||
############################################
|
||||
|
|
Loading…
Reference in New Issue