From 6f20bdbad026e0a0aadd44084bb6651b1b8e3bcd Mon Sep 17 00:00:00 2001
From: Jay Graber <jay@z.cash>
Date: Fri, 25 Aug 2017 15:42:30 -0700
Subject: [PATCH] Pull addr validation up into cli.py

---
 xcat/cli.py   |  9 +++++++++
 xcat/utils.py | 12 ------------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/xcat/cli.py b/xcat/cli.py
index 9b412b4..5b41fc1 100644
--- a/xcat/cli.py
+++ b/xcat/cli.py
@@ -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)
diff --git a/xcat/utils.py b/xcat/utils.py
index 85bf8bd..5a1315c 100644
--- a/xcat/utils.py
+++ b/xcat/utils.py
@@ -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 #################
 ############################################