Fix import/export cli tests
This commit is contained in:
parent
9bb7b7c0f5
commit
0fcad69b06
12
xcat/cli.py
12
xcat/cli.py
|
@ -57,22 +57,23 @@ def checkBuyStatus(tradeid):
|
|||
print("XCAT trade complete!")
|
||||
|
||||
# Import a trade in hex, and save to db
|
||||
def importtrade(hexstr):
|
||||
def importtrade(hexstr, tradeid):
|
||||
trade = x2s(hexstr)
|
||||
trade = db.instantiate(trade)
|
||||
save_state(trade)
|
||||
save_state(trade, tradeid)
|
||||
|
||||
# Export a trade by its tradeid
|
||||
def exporttrade(tradeid):
|
||||
# trade = get_trade()
|
||||
trade = db.get(tradeid)
|
||||
hexstr = s2x(str(trade))
|
||||
print(trade)
|
||||
hexstr = s2x(trade.toJSON())
|
||||
print(hexstr)
|
||||
return hexstr
|
||||
|
||||
def findtrade(tradeid):
|
||||
trade = db.get(tradeid)
|
||||
print(trade)
|
||||
return trade
|
||||
|
||||
def checktrade(tradeid):
|
||||
print("In checktrade")
|
||||
|
@ -122,7 +123,8 @@ def main():
|
|||
command = args.command
|
||||
if command == 'importtrade':
|
||||
hexstr = args.argument[0]
|
||||
importtrade(hexstr)
|
||||
tradeid = args.argument[1]
|
||||
importtrade(hexstr, tradeid)
|
||||
elif command == 'exporttrade':
|
||||
tradeid = args.argument[0]
|
||||
exporttrade(tradeid)
|
||||
|
|
|
@ -151,7 +151,7 @@ def buyer_fulfill(trade):
|
|||
print_trade('buyer')
|
||||
|
||||
def seller_init(trade):
|
||||
# Get amounts
|
||||
# TODO: pass in amounts, or get from cli. {"amounts": {"buy": {}, "sell": {}}}
|
||||
amounts = userInput.get_trade_amounts()
|
||||
sell = amounts['sell']
|
||||
buy = amounts['buy']
|
||||
|
|
|
@ -5,23 +5,24 @@ from xcat.tests.utils import mktrade
|
|||
class SimpleTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.trade = mktrade()
|
||||
self.hexstr = cli.exporttrade('test')
|
||||
|
||||
# def test_exporttrade(self):
|
||||
# self.assertTrue(int(self.hexstr, 16))
|
||||
def test_exporttrade(self):
|
||||
self.__class__.hexstr = cli.exporttrade('test')
|
||||
self.assertTrue(int(self.hexstr, 16))
|
||||
|
||||
class CliTest(SimpleTestCase):
|
||||
# def test_importtrade(self):
|
||||
# trade = cli.importtrade(self.hexstr, 'test')
|
||||
def test_importtrade(self):
|
||||
trade = cli.importtrade(self.__class__.hexstr, 'test')
|
||||
|
||||
def test_findtrade(self):
|
||||
trade = cli.findtrade('test')
|
||||
|
||||
def test_newtrade(self):
|
||||
cli.newtrade('test2')
|
||||
cli.checkBuyStatus('test2')
|
||||
cli.checkSellStatus('test2')
|
||||
cli.checkBuyStatus('test2')
|
||||
# class CliTest(SimpleTestCase):
|
||||
# def test_findtrade(self):
|
||||
# trade = cli.findtrade('test')
|
||||
|
||||
# def test_newtrade(self):
|
||||
# cli.newtrade('test2')
|
||||
# cli.checkBuyStatus('test2')
|
||||
# cli.checkSellStatus('test2')
|
||||
# cli.checkBuyStatus('test2')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
Loading…
Reference in New Issue