From 75af3528bdde7106b32bc1a7a3ee11fbcd14c6ab Mon Sep 17 00:00:00 2001
From: Paul Lange <palango@users.noreply.github.com>
Date: Mon, 18 Jun 2018 14:39:20 +0200
Subject: [PATCH] Adapt settle method in MockClient for contracts update (#94)

---
 raiden_libs/test/mocks/client.py | 36 +++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/raiden_libs/test/mocks/client.py b/raiden_libs/test/mocks/client.py
index 9627dfd8c0..e1591902dc 100644
--- a/raiden_libs/test/mocks/client.py
+++ b/raiden_libs/test/mocks/client.py
@@ -215,16 +215,32 @@ def settle_channel(
         assert len(transferred) == 2
         assert len(locked) == 2
         assert len(locksroot) == 2
-        self.contract.functions.settleChannel(
-            self.address,
-            transferred[0],
-            locked[0],
-            locksroot[0],
-            partner_address,
-            transferred[1],
-            locked[1],
-            locksroot[1]
-        ).transact({'from': self.address})
+
+        # locked + transferred amount of p2 have to be bigger than p1 for the settle call
+        # fix order if necessary
+        if transferred[0] + locked[0] > transferred[1] + locked[1]:
+            print('reorder')
+            self.contract.functions.settleChannel(
+                partner_address,
+                transferred[1],
+                locked[1],
+                locksroot[1],
+                self.address,
+                transferred[0],
+                locked[0],
+                locksroot[0],
+            ).transact({'from': self.address})
+        else:
+            self.contract.functions.settleChannel(
+                self.address,
+                transferred[0],
+                locked[0],
+                locksroot[0],
+                partner_address,
+                transferred[1],
+                locked[1],
+                locksroot[1],
+            ).transact({'from': self.address})
 
     @assert_channel_existence
     def get_balance_proof(self, partner_address: Address, **kwargs) -> BalanceProof: