bfxbot/utils.py

@@ -21,20 +21,24 @@ class CurrencyPair:
         return CurrencyPair(match.group("base"), match.group("quote"))
 
 
-def net_pl_percentage(perc: float, reference_fee_perc: float):
-    return perc - reference_fee_perc
+def average(a):
+    return sum(a) / len(a)
 
 
 def balance_to_json(balance: Balance):
     return {
-        'currency': balance.currency,
-        'amount': balance.amount,
-        'kind': balance.kind.value,
-        'quote': balance.quote,
-        'quote_equivalent': balance.quote_equivalent
+        'currency': balance.currency().name(),
+        'amount': balance.currency().amount(),
+        'kind': balance.wallet().value,
+        'quote': balance.quote().value,
+        'quote_equivalent': balance.quote_equivalent()
     }
 
 
+def net_pl_percentage(perc: float, reference_fee_perc: float):
+    return perc - reference_fee_perc
+
+
 def pw_to_posprop(pw: PositionWrapper):
     pair = CurrencyPair.from_str(pw.position.symbol)