Fix tests

Author: Caleb Quilley

cogs/commands/market.py

@@ -75,16 +75,13 @@ def match(self):
 
             earliest_trade = min(bid, ask, key=lambda x: x.order_time)
 
-            bid.price = earliest_trade.price
-            ask.price = earliest_trade.price
-
-            bought = Order(earliest_trade.price, 'bid', bid.price, qty, bid.order_time)
+            bought = Order(earliest_trade.price, 'bid', bid.user_id, qty, bid.order_time)
             sold   = Order(earliest_trade.price, 'ask', ask.user_id, qty, ask.order_time)
 
             self.trade_history[bid.user_id].append(bought)
             self.trade_history[ask.user_id].append(sold)
 
-            self.last_trade = f"<@{bid.user_id}> bought {qty} from <@{ask.user_id}> at {bid.price}"
+            self.last_trade = f"<@{bid.user_id}> bought {qty} from <@{ask.user_id}> at {bought.price}"
 
             if ask.qty > qty:
                 heapq.heappush(self.asks, Order(ask.price, 'ask', ask.user_id, ask.qty - qty, ask.order_time))
@@ -164,7 +161,7 @@ def __str__(self):
                 bid_vol = bid_counts.get(price, [" " * 15] * 2)
                 ask_vol = ask_counts.get(price, [" " * 10] * 2)
                 formatted_price = f"{price:.2f}"
-                order_book_lines.append(f"{str(bid_vol[0])} | {str(bid_vol[1]):<15} | {str(formatted_price):<10} | {str(ask_vol[1]):<15} | {str(ask_vol)[0]}")
+                order_book_lines.append(f"{str(bid_vol[0]):<15} | {str(bid_vol[1]):<15} | {str(formatted_price):<10} | {str(ask_vol[1]):<15} | {str(ask_vol[0])}")
 
             order_book_lines.append("```")
 

tests/test_market.py

@@ -10,11 +10,14 @@ def test_can_place_orders():
     assert len(m.bids) == 1
 
     assert str(m) == """Market is: OPEN
+
 📊 **TEST Order Book** 📊
-Bid Orders | Bid Volume | Price | Ask Volume | Ask Orders
-           |            | 102   |          7 |          2
-1          |          3 | 101   |            |           
-"""
+```
+Bid Orders      | Bid Volume      | Price      | Ask Volume      | Ask Orders
+                |                 | 102.00     | 5               | 2
+1               | 3               | 101.00     |                 |           
+```
+Last Trade: None"""
 
 def test_single_match():
     m = Market("test")
@@ -46,6 +49,7 @@ def test_multi_match():
     assert m.asks[0].user_id == 3
     assert len(m.trade_history[1]) == 1
     assert len(m.trade_history[2]) == 1
+    assert 3 not in m.trade_history
     assert len(m.trade_history[4]) == 2
 
 def test_turning():
@@ -63,11 +67,10 @@ def test_multi_level_clear():
     assert m.ask(101, 1, 1, 2) is None
     assert m.ask(102, 1, 1, 3) is None
     assert m.ask(103, 1, 100, 4) is None
-    assert m.bid(103, 2, 10, 4) == """<@2> bought 1 from <@1> at 100
+    assert m.bid(103, 2, 10, 5) == """<@2> bought 1 from <@1> at 100
 <@2> bought 1 from <@1> at 101
 <@2> bought 1 from <@1> at 102
-<@2> bought 7 from <@1> at 103
-"""
+<@2> bought 7 from <@1> at 103"""
     assert len(m.bids) == 0
     assert len(m.asks) == 1
     assert m.asks[0].qty == 93