From 7eaeb8d1469ef762216837bfb1a257bab8307562 Mon Sep 17 00:00:00 2001
From: gcarq <michael.egger@tsn.at>
Date: Thu, 12 Jul 2018 17:27:40 +0200
Subject: [PATCH] status: return arrow object instead humanized str

---
 freqtrade/rpc/rpc.py                     | 4 ++--
 freqtrade/rpc/telegram.py                | 4 ++++
 freqtrade/tests/rpc/test_rpc.py          | 4 ++--
 freqtrade/tests/rpc/test_rpc_telegram.py | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py
index faf0653b1..621c19fd2 100644
--- a/freqtrade/rpc/rpc.py
+++ b/freqtrade/rpc/rpc.py
@@ -69,7 +69,7 @@ class RPC(object):
     def send_msg(self, msg: Dict[str, str]) -> None:
         """ Sends a message to all registered rpc modules """
 
-    def _rpc_trade_status(self) -> List[Dict]:
+    def _rpc_trade_status(self) -> List[Dict[str, Any]]:
         """
         Below follows the RPC backend it is prefixed with rpc_ to raise awareness that it is
         a remotely exposed function
@@ -95,7 +95,7 @@ class RPC(object):
                     trade_id=trade.id,
                     pair=trade.pair,
                     market_url=self._freqtrade.exchange.get_pair_detail_url(trade.pair),
-                    date=arrow.get(trade.open_date).humanize(),
+                    date=arrow.get(trade.open_date),
                     open_rate=trade.open_rate,
                     close_rate=trade.close_rate,
                     current_rate=current_rate,
diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py
index 39724a2f9..37dbb34ff 100644
--- a/freqtrade/rpc/telegram.py
+++ b/freqtrade/rpc/telegram.py
@@ -166,6 +166,10 @@ class Telegram(RPC):
 
         try:
             results = self._rpc_trade_status()
+            # pre format data
+            for result in results:
+                result['date'] = result['date'].humanize()
+
             messages = [
                 "*Trade ID:* `{trade_id}`\n"
                 "*Current Pair:* [{pair}]({market_url})\n"
diff --git a/freqtrade/tests/rpc/test_rpc.py b/freqtrade/tests/rpc/test_rpc.py
index 23e14cfbb..6e59b4116 100644
--- a/freqtrade/tests/rpc/test_rpc.py
+++ b/freqtrade/tests/rpc/test_rpc.py
@@ -5,7 +5,7 @@ Unit test file for rpc/rpc.py
 """
 
 from datetime import datetime
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, ANY
 
 import pytest
 
@@ -59,7 +59,7 @@ def test_rpc_trade_status(default_conf, ticker, fee, markets, mocker) -> None:
         'trade_id': 1,
         'pair': 'ETH/BTC',
         'market_url': 'https://bittrex.com/Market/Index?MarketName=BTC-ETH',
-        'date': 'just now',
+        'date': ANY,
         'open_rate': 1.099e-05,
         'close_rate': None,
         'current_rate': 1.098e-05,
diff --git a/freqtrade/tests/rpc/test_rpc_telegram.py b/freqtrade/tests/rpc/test_rpc_telegram.py
index baf9f124d..b13097eed 100644
--- a/freqtrade/tests/rpc/test_rpc_telegram.py
+++ b/freqtrade/tests/rpc/test_rpc_telegram.py
@@ -11,6 +11,7 @@ from datetime import datetime
 from random import randint
 from unittest.mock import MagicMock, ANY
 
+import arrow
 from telegram import Chat, Message, Update
 from telegram.error import NetworkError
 
@@ -198,6 +199,7 @@ def test_status(default_conf, update, mocker, fee, ticker, markets) -> None:
 
     patch_get_signal(mocker, (True, False))
     patch_coinmarketcap(mocker)
+
     mocker.patch.multiple(
         'freqtrade.exchange.Exchange',
         validate_pairs=MagicMock(),
@@ -215,7 +217,7 @@ def test_status(default_conf, update, mocker, fee, ticker, markets) -> None:
             'trade_id': 1,
             'pair': 'ETH/BTC',
             'market_url': 'https://bittrex.com/Market/Index?MarketName=BTC-ETH',
-            'date': 'just now',
+            'date': arrow.utcnow(),
             'open_rate': 1.099e-05,
             'close_rate': None,
             'current_rate': 1.098e-05,