2 files changed, 393 insertions, 90 deletions

diff --git a/portfolio.py b/portfolio.py
index b3065b8..45fbef9 100644
--- a/portfolio.py
+++ b/portfolio.py
@@ -116,6 +116,8 @@ class Amount:
             return self.__add__(other)
 
     def __sub__(self, other):
+        if other == 0:
+            return self
         if other.currency != self.currency and other.value * self.value != 0:
             raise Exception("Summing amounts must be done with same currencies")
         return Amount(self.currency, self.value - other.value)
@@ -197,7 +199,7 @@ class Balance:
                     "margin_lending_fees",
                     "margin_borrowed_base_price"
                     ]:
-                setattr(self, key, Amount(base_currency, hash_[key]))
+                setattr(self, key, Amount(base_currency, hash_.get(key, 0)))
 
     @classmethod
     def in_currency(cls, other_currency, market, compute_value="average", type="total"):
diff --git a/test.py b/test.py
index 6e27475..b27eb74 100644
--- a/test.py
+++ b/test.py
@@ -4,6 +4,7 @@ from decimal import Decimal as D
 from unittest import mock
 import requests
 import requests_mock
+from io import StringIO
 
 class WebMockTestCase(unittest.TestCase):
     import time
@@ -20,7 +21,8 @@ class WebMockTestCase(unittest.TestCase):
                     ticker_cache={},
                     ticker_cache_timestamp=self.time.time(),
                     fees_cache={},
-                    trades={}),
+                    debug=False,
+                    trades=[]),
                 mock.patch.multiple(portfolio.Computation,
                     computations=portfolio.Computation.computations)
                 ]
@@ -363,29 +365,30 @@ class BalanceTest(WebMockTestCase):
         super(BalanceTest, self).setUp()
 
         self.fetch_balance = {
-                "free": "foo",
-                "info": "bar",
-                "used": "baz",
-                "total": "bazz",
                 "ETC": {
-                    "free": 0.0,
-                    "used": 0.0,
-                    "total": 0.0
+                    "exchange_free": 0,
+                    "exchange_used": 0,
+                    "exchange_total": 0,
+                    "margin_total": 0,
                     },
                 "USDT": {
-                    "free": 6.0,
-                    "used": 1.2,
-                    "total": 7.2
+                    "exchange_free": D("6.0"),
+                    "exchange_used": D("1.2"),
+                    "exchange_total": D("7.2"),
+                    "margin_total": 0,
                     },
                 "XVG": {
-                    "free": 16,
-                    "used": 0.0,
-                    "total": 16
+                    "exchange_free": 16,
+                    "exchange_used": 0,
+                    "exchange_total": 16,
+                    "margin_total": 0,
                     },
                 "XMR": {
-                    "free": 0.0,
-                    "used": 0.0,
-                    "total": 0.0
+                    "exchange_free": 0,
+                    "exchange_used": 0,
+                    "exchange_total": 0,
+                    "margin_total": D("-1.0"),
+                    "margin_free": 0,
                     },
                 }
 
@@ -472,25 +475,25 @@ class BalanceTest(WebMockTestCase):
                 }
         self.assertListEqual(["BTC", "ETH"], list(portfolio.Balance.currencies()))
 
-    @unittest.expectedFailure
-    @mock.patch.object(portfolio.market, "fetch_balance")
-    def test_fetch_balances(self, fetch_balance):
-        fetch_balance.return_value = self.fetch_balance
+    @mock.patch.object(portfolio.market, "fetch_all_balances")
+    def test_fetch_balances(self, fetch_all_balances):
+        fetch_all_balances.return_value = self.fetch_balance
 
         portfolio.Balance.fetch_balances(portfolio.market)
-        self.assertNotIn("XMR", portfolio.Balance.currencies())
-        self.assertListEqual(["USDT", "XVG"], list(portfolio.Balance.currencies()))
+        self.assertNotIn("ETC", portfolio.Balance.currencies())
+        self.assertListEqual(["USDT", "XVG", "XMR"], list(portfolio.Balance.currencies()))
 
-        portfolio.Balance.known_balances["ETC"] = portfolio.Balance("ETC", "1", "0", "1")
+        portfolio.Balance.known_balances["ETC"] = portfolio.Balance("ETC", {
+            "exchange_total": "1", "exchange_free": "0",
+            "exchange_used": "1" })
         portfolio.Balance.fetch_balances(portfolio.market)
         self.assertEqual(0, portfolio.Balance.known_balances["ETC"].total)
-        self.assertListEqual(["USDT", "XVG", "ETC"], list(portfolio.Balance.currencies()))
+        self.assertListEqual(["USDT", "XVG", "XMR", "ETC"], list(portfolio.Balance.currencies()))
 
-    @unittest.expectedFailure
     @mock.patch.object(portfolio.Portfolio, "repartition")
-    @mock.patch.object(portfolio.market, "fetch_balance")
-    def test_dispatch_assets(self, fetch_balance, repartition):
-        fetch_balance.return_value = self.fetch_balance
+    @mock.patch.object(portfolio.market, "fetch_all_balances")
+    def test_dispatch_assets(self, fetch_all_balances, repartition):
+        fetch_all_balances.return_value = self.fetch_balance
         portfolio.Balance.fetch_balances(portfolio.market)
 
         self.assertNotIn("XEM", portfolio.Balance.currencies())
@@ -505,7 +508,6 @@ class BalanceTest(WebMockTestCase):
         self.assertEqual(D("2.6"), amounts["BTC"].value)
         self.assertEqual(D("7.5"), amounts["XEM"].value)
 
-    @unittest.expectedFailure
     @mock.patch.object(portfolio.Portfolio, "repartition")
     @mock.patch.object(portfolio.Trade, "get_ticker")
     @mock.patch.object(portfolio.Trade, "compute_trades")
@@ -525,15 +527,17 @@ class BalanceTest(WebMockTestCase):
         get_ticker.side_effect = _get_ticker
 
         market = mock.Mock()
-        market.fetch_balance.return_value = {
+        market.fetch_all_balances.return_value = {
                 "USDT": {
-                    "free": D("10000.0"),
-                    "used": D("0.0"),
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
                     "total": D("10000.0")
                     },
                 "XVG": {
-                    "free": D("10000.0"),
-                    "used": D("0.0"),
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
                     "total": D("10000.0")
                     },
                 }
@@ -547,14 +551,102 @@ class BalanceTest(WebMockTestCase):
         self.assertEqual(D("0.2525"), call[0][1]["BTC"].value)
         self.assertEqual(D("0.7575"), call[0][1]["XEM"].value)
 
-    @unittest.skip("TODO")
-    def test_update_trades(self):
-        pass
+    @mock.patch.object(portfolio.Portfolio, "repartition")
+    @mock.patch.object(portfolio.Trade, "get_ticker")
+    @mock.patch.object(portfolio.Trade, "compute_trades")
+    def test_update_trades(self, compute_trades, get_ticker, repartition):
+        repartition.return_value = {
+                "XEM": (D("0.75"), "long"),
+                "BTC": (D("0.25"), "long"),
+                }
+        def _get_ticker(c1, c2, market):
+            if c1 == "USDT" and c2 == "BTC":
+                return { "average": D("0.0001") }
+            if c1 == "XVG" and c2 == "BTC":
+                return { "average": D("0.000001") }
+            if c1 == "XEM" and c2 == "BTC":
+                return { "average": D("0.001") }
+            self.fail("Should be called with {}, {}".format(c1, c2))
+        get_ticker.side_effect = _get_ticker
+
+        market = mock.Mock()
+        market.fetch_all_balances.return_value = {
+                "USDT": {
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
+                    "total": D("10000.0")
+                    },
+                "XVG": {
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
+                    "total": D("10000.0")
+                    },
+                }
+        portfolio.Balance.update_trades(market)
+        compute_trades.assert_called()
+
+        call = compute_trades.call_args
+        self.assertEqual(market, call[1]["market"])
+        self.assertEqual(1, call[0][0]["USDT"].value)
+        self.assertEqual(D("0.01"), call[0][0]["XVG"].value)
+        self.assertEqual(D("0.2525"), call[0][1]["BTC"].value)
+        self.assertEqual(D("0.7575"), call[0][1]["XEM"].value)
+
+    @mock.patch.object(portfolio.Portfolio, "repartition")
+    @mock.patch.object(portfolio.Trade, "get_ticker")
+    @mock.patch.object(portfolio.Trade, "compute_trades")
+    def test_prepare_trades_to_sell_all(self, compute_trades, get_ticker, repartition):
+        def _get_ticker(c1, c2, market):
+            if c1 == "USDT" and c2 == "BTC":
+                return { "average": D("0.0001") }
+            if c1 == "XVG" and c2 == "BTC":
+                return { "average": D("0.000001") }
+            self.fail("Should be called with {}, {}".format(c1, c2))
+        get_ticker.side_effect = _get_ticker
+
+        market = mock.Mock()
+        market.fetch_all_balances.return_value = {
+                "USDT": {
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
+                    "total": D("10000.0")
+                    },
+                "XVG": {
+                    "exchange_free": D("10000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("10000.0"),
+                    "total": D("10000.0")
+                    },
+                }
+        portfolio.Balance.prepare_trades_to_sell_all(market)
+        repartition.assert_not_called()
+        compute_trades.assert_called()
+
+        call = compute_trades.call_args
+        self.assertEqual(market, call[1]["market"])
+        self.assertEqual(1, call[0][0]["USDT"].value)
+        self.assertEqual(D("0.01"), call[0][0]["XVG"].value)
+        self.assertEqual(D("1.01"), call[0][1]["BTC"].value)
 
-    @unittest.expectedFailure
     def test__repr(self):
-        balance = portfolio.Balance("BTX", 3, 1, 2)
-        self.assertEqual("Balance(BTX [1.00000000 BTX/2.00000000 BTX/3.00000000 BTX])", repr(balance))
+        self.assertEqual("Balance(BTX Exch: [✔2.00000000 BTX])",
+                repr(portfolio.Balance("BTX", { "exchange_free": 2, "exchange_total": 2 })))
+        balance = portfolio.Balance("BTX", { "exchange_total": 3,
+            "exchange_used": 1, "exchange_free": 2 })
+        self.assertEqual("Balance(BTX Exch: [✔2.00000000 BTX + ❌1.00000000 BTX = 3.00000000 BTX])", repr(balance))
+
+        balance = portfolio.Balance("BTX", { "margin_total": 3,
+            "margin_borrowed": 1, "margin_free": 2 })
+        self.assertEqual("Balance(BTX Margin: [✔2.00000000 BTX + borrowed 1.00000000 BTX = 3.00000000 BTX])", repr(balance))
+
+        balance = portfolio.Balance("BTX", { "margin_total": -3,
+            "margin_borrowed_base_price": D("0.1"),
+            "margin_borrowed_base_currency": "BTC",
+            "margin_lending_fees": D("0.002") })
+        self.assertEqual("Balance(BTX Margin: [-3.00000000 BTX @@ 0.10000000 BTC/0.00200000 BTC])", repr(balance))
 
 class TradeTest(WebMockTestCase):
 
@@ -623,12 +715,11 @@ class TradeTest(WebMockTestCase):
         self.assertDictEqual(ticker6, ticker7)
         self.assertEqual(1.2, ticker8["bid"])
 
-    @unittest.skip("TODO")
     def test_values_assertion(self):
-        value_from = Amount("BTC", "1.0")
-        value_from.linked_to = Amount("ETH", "10.0")
-        value_to = Amount("BTC", "1.0")
-        trade = portfolioTrade(value_from, value_to, "ETH")
+        value_from = portfolio.Amount("BTC", "1.0")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
         self.assertEqual("BTC", trade.base_currency)
         self.assertEqual("ETH", trade.currency)
 
@@ -641,63 +732,275 @@ class TradeTest(WebMockTestCase):
             value_from.currency = "ETH"
             portfolio.Trade(value_from, value_to, "ETH")
 
-    @unittest.skip("TODO")
+        value_from = portfolio.Amount("BTC", 0)
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+        self.assertEqual(0, trade.value_from.linked_to)
+
     def test_fetch_fees(self):
-        pass
+        market = mock.Mock()
+        market.fetch_fees.return_value = "Foo"
+        self.assertEqual("Foo", portfolio.Trade.fetch_fees(market))
+        market.fetch_fees.assert_called_once()
+        self.assertEqual("Foo", portfolio.Trade.fetch_fees(market))
+        market.fetch_fees.assert_called_once()
+
+    def test_action(self):
+        value_from = portfolio.Amount("BTC", "1.0")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertIsNone(trade.action)
+
+        value_from = portfolio.Amount("BTC", "1.0")
+        value_from.linked_to = portfolio.Amount("BTC", "1.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "BTC")
+
+        self.assertIsNone(trade.action)
+
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("acquire", trade.action)
+
+        value_from = portfolio.Amount("BTC", "0")
+        value_from.linked_to = portfolio.Amount("ETH", "0")
+        value_to = portfolio.Amount("BTC", "-1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("dispose", trade.action)
+
+    def test_order_action(self):
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("buy", trade.order_action(False))
+        self.assertEqual("sell", trade.order_action(True))
+
+        value_from = portfolio.Amount("BTC", "0")
+        value_from.linked_to = portfolio.Amount("ETH", "0")
+        value_to = portfolio.Amount("BTC", "-1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("sell", trade.order_action(False))
+        self.assertEqual("buy", trade.order_action(True))
+
+    def test_trade_type(self):
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("long", trade.trade_type)
+
+        value_from = portfolio.Amount("BTC", "0")
+        value_from.linked_to = portfolio.Amount("ETH", "0")
+        value_to = portfolio.Amount("BTC", "-1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("short", trade.trade_type)
+
+    def test_filled_amount(self):
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        order1 = mock.Mock()
+        order1.filled_amount = portfolio.Amount("ETH", "0.3")
+
+        order2 = mock.Mock()
+        order2.filled_amount = portfolio.Amount("ETH", "0.01")
+        trade.orders.append(order1)
+        trade.orders.append(order2)
+
+        self.assertEqual(portfolio.Amount("ETH", "0.31"), trade.filled_amount)
+
+    def test_prepare_orders(self):
+        trade_mock1 = mock.Mock()
+        trade_mock2 = mock.Mock()
+
+        portfolio.Trade.trades.append(trade_mock1)
+        portfolio.Trade.trades.append(trade_mock2)
+
+        portfolio.Trade.prepare_orders()
+        trade_mock1.prepare_order.assert_called_with(compute_value="default")
+        trade_mock2.prepare_order.assert_called_with(compute_value="default")
+
+        portfolio.Trade.prepare_orders(compute_value="bla")
+        trade_mock1.prepare_order.assert_called_with(compute_value="bla")
+        trade_mock2.prepare_order.assert_called_with(compute_value="bla")
+
+        trade_mock1.prepare_order.reset_mock()
+        trade_mock2.prepare_order.reset_mock()
+
+        trade_mock1.action = "foo"
+        trade_mock2.action = "bar"
+        portfolio.Trade.prepare_orders(only="bar")
+        trade_mock1.prepare_order.assert_not_called()
+        trade_mock2.prepare_order.assert_called_with(compute_value="default")
 
     @unittest.skip("TODO")
     def test_compute_trades(self):
         pass
 
     @unittest.skip("TODO")
-    def test_action(self):
+    def test_prepare_order(self):
         pass
 
     @unittest.skip("TODO")
-    def test_action(self):
+    def test_update_order(self):
         pass
 
     @unittest.skip("TODO")
-    def test_order_action(self):
+    def test_follow_orders(self):
         pass
 
     @unittest.skip("TODO")
-    def test_prepare_order(self):
+    def test_move_balances(self):
         pass
 
-    @unittest.skip("TODO")
     def test_all_orders(self):
-        pass
+        trade_mock1 = mock.Mock()
+        trade_mock2 = mock.Mock()
 
-    @unittest.skip("TODO")
-    def test_follow_orders(self):
-        pass
+        order_mock1 = mock.Mock()
+        order_mock2 = mock.Mock()
+        order_mock3 = mock.Mock()
+
+        trade_mock1.orders = [order_mock1, order_mock2]
+        trade_mock2.orders = [order_mock3]
+
+        order_mock1.status = "pending"
+        order_mock2.status = "open"
+        order_mock3.status = "open"
+
+        portfolio.Trade.trades.append(trade_mock1)
+        portfolio.Trade.trades.append(trade_mock2)
+
+        orders = portfolio.Trade.all_orders()
+        self.assertEqual(3, len(orders))
+
+        open_orders = portfolio.Trade.all_orders(state="open")
+        self.assertEqual(2, len(open_orders))
+        self.assertEqual([order_mock2, order_mock3], open_orders)
+
+    @mock.patch.object(portfolio.Trade, "all_orders")
+    def test_run_orders(self, all_orders):
+        order_mock1 = mock.Mock()
+        order_mock2 = mock.Mock()
+        order_mock3 = mock.Mock()
+        all_orders.return_value = [order_mock1, order_mock2, order_mock3]
+        portfolio.Trade.run_orders()
+        all_orders.assert_called_with(state="pending")
+
+        order_mock1.run.assert_called()
+        order_mock2.run.assert_called()
+        order_mock3.run.assert_called()
+
+    @mock.patch.object(portfolio.Trade, "all_orders")
+    def test_update_all_orders_status(self, all_orders):
+        order_mock1 = mock.Mock()
+        order_mock2 = mock.Mock()
+        order_mock3 = mock.Mock()
+        all_orders.return_value = [order_mock1, order_mock2, order_mock3]
+        portfolio.Trade.update_all_orders_status()
+        all_orders.assert_called_with(state="open")
+
+        order_mock1.get_status.assert_called()
+        order_mock2.get_status.assert_called()
+        order_mock3.get_status.assert_called()
+
+    def test_print_all_with_order(self):
+        trade_mock1 = mock.Mock()
+        trade_mock2 = mock.Mock()
+        trade_mock3 = mock.Mock()
+        portfolio.Trade.trades = [trade_mock1, trade_mock2, trade_mock3]
+
+        portfolio.Trade.print_all_with_order()
+
+        trade_mock1.print_with_order.assert_called()
+        trade_mock2.print_with_order.assert_called()
+        trade_mock3.print_with_order.assert_called()
+
+    @mock.patch('sys.stdout', new_callable=StringIO)
+    def test_print_with_order(self, mock_stdout):
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        order_mock1 = mock.Mock()
+        order_mock1.__repr__ = mock.Mock()
+        order_mock1.__repr__.return_value = "Mock 1"
+        order_mock2 = mock.Mock()
+        order_mock2.__repr__ = mock.Mock()
+        order_mock2.__repr__.return_value = "Mock 2"
+        trade.orders.append(order_mock1)
+        trade.orders.append(order_mock2)
+
+        trade.print_with_order()
+
+        out = mock_stdout.getvalue().split("\n")
+        self.assertEqual("Trade(0.50000000 BTC [10.00000000 ETH] -> 1.00000000 BTC in ETH, acquire)", out[0])
+        self.assertEqual("\tMock 1", out[1])
+        self.assertEqual("\tMock 2", out[2])
 
-    @unittest.skip("TODO")
     def test_compute_value(self):
-        pass
+        compute = mock.Mock()
+        portfolio.Trade.compute_value("foo", "buy", compute_value=compute)
+        compute.assert_called_with("foo", "ask")
+
+        compute.reset_mock()
+        portfolio.Trade.compute_value("foo", "sell", compute_value=compute)
+        compute.assert_called_with("foo", "bid")
+
+        compute.reset_mock()
+        portfolio.Trade.compute_value("foo", "ask", compute_value=compute)
+        compute.assert_called_with("foo", "ask")
+
+        compute.reset_mock()
+        portfolio.Trade.compute_value("foo", "bid", compute_value=compute)
+        compute.assert_called_with("foo", "bid")
+
+        compute.reset_mock()
+        portfolio.Computation.computations["test"] = compute
+        portfolio.Trade.compute_value("foo", "bid", compute_value="test")
+        compute.assert_called_with("foo", "bid")
 
-    @unittest.skip("TODO")
     def test__repr(self):
-        pass
+        value_from = portfolio.Amount("BTC", "0.5")
+        value_from.linked_to = portfolio.Amount("ETH", "10.0")
+        value_to = portfolio.Amount("BTC", "1.0")
+        trade = portfolio.Trade(value_from, value_to, "ETH")
+
+        self.assertEqual("Trade(0.50000000 BTC [10.00000000 ETH] -> 1.00000000 BTC in ETH, acquire)", str(trade))
 
 class AcceptanceTest(WebMockTestCase):
     @unittest.expectedFailure
     def test_success_sell_only_necessary(self):
         fetch_balance = {
                 "ETH": {
-                    "free": D("1.0"),
-                    "used": D("0.0"),
+                    "exchange_free": D("1.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("1.0"),
                     "total": D("1.0"),
                     },
                 "ETC": {
-                    "free": D("4.0"),
-                    "used": D("0.0"),
+                    "exchange_free": D("4.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("4.0"),
                     "total": D("4.0"),
                     },
                 "XVG": {
-                    "free": D("1000.0"),
-                    "used": D("0.0"),
+                    "exchange_free": D("1000.0"),
+                    "exchange_used": D("0.0"),
+                    "exchange_total": D("1000.0"),
                     "total": D("1000.0"),
                     },
                 }
@@ -752,7 +1055,7 @@ class AcceptanceTest(WebMockTestCase):
             self.fail("Shouldn't have been called with {}".format(symbol))
 
         market = mock.Mock()
-        market.fetch_balance.return_value = fetch_balance
+        market.fetch_all_balances.return_value = fetch_balance
         market.fetch_ticker.side_effect = fetch_ticker
         with mock.patch.object(portfolio.Portfolio, "repartition", return_value=repartition):
             # Action 1
@@ -765,34 +1068,32 @@ class AcceptanceTest(WebMockTestCase):
 
 
         trades = portfolio.Trade.trades
-        self.assertEqual(portfolio.Amount("BTC", D("0.15")), trades["ETH"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.05")), trades["ETH"].value_to)
-        self.assertEqual("sell", trades["ETH"].action)
+        self.assertEqual(portfolio.Amount("BTC", D("0.15")), trades[0].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("0.05")), trades[0].value_to)
+        self.assertEqual("dispose", trades[0].action)
 
-        self.assertEqual(portfolio.Amount("BTC", D("0.01")), trades["ETC"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.05")), trades["ETC"].value_to)
-        self.assertEqual("buy", trades["ETC"].action)
-
-        self.assertNotIn("BTC", trades)
+        self.assertEqual(portfolio.Amount("BTC", D("0.01")), trades[1].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("0.05")), trades[1].value_to)
+        self.assertEqual("acquire", trades[1].action)
 
-        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades["BTD"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.002")), trades["BTD"].value_to)
-        self.assertEqual("buy", trades["BTD"].action)
+        self.assertEqual(portfolio.Amount("BTC", D("0.04")), trades[2].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades[2].value_to)
+        self.assertEqual("dispose", trades[2].action)
 
-        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades["B2X"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.008")), trades["B2X"].value_to)
-        self.assertEqual("buy", trades["B2X"].action)
+        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades[3].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("-0.002")), trades[3].value_to)
+        self.assertEqual("dispose", trades[3].action)
 
-        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades["USDT"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.01")), trades["USDT"].value_to)
-        self.assertEqual("buy", trades["USDT"].action)
+        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades[4].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("0.008")), trades[4].value_to)
+        self.assertEqual("acquire", trades[4].action)
 
-        self.assertEqual(portfolio.Amount("BTC", D("0.04")), trades["XVG"].value_from)
-        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades["XVG"].value_to)
-        self.assertEqual("sell", trades["XVG"].action)
+        self.assertEqual(portfolio.Amount("BTC", D("0.00")), trades[5].value_from)
+        self.assertEqual(portfolio.Amount("BTC", D("0.01")), trades[5].value_to)
+        self.assertEqual("acquire", trades[5].action)
 
         # Action 2
-        portfolio.Trade.prepare_orders(only="sell", compute_value=lambda x, y: x["bid"] * D("1.001"))
+        portfolio.Trade.prepare_orders(only="dispose", compute_value=lambda x, y: x["bid"] * D("1.001"))
 
         all_orders = portfolio.Trade.all_orders()
         self.assertEqual(2, len(all_orders))