From 447268cf295a7f8ca76260b7e73d6fdb73977f4a Mon Sep 17 00:00:00 2001
From: moneromooo-monero <moneromooo-monero@users.noreply.github.com>
Date: Mon, 29 Apr 2019 19:48:03 +0000
Subject: [PATCH] functional_tests: add multisig state tests

---
 tests/functional_tests/multisig.py   | 68 ++++++++++++++++++++++++++++
 utils/python-rpc/framework/wallet.py | 12 +++++
 2 files changed, 80 insertions(+)

diff --git a/tests/functional_tests/multisig.py b/tests/functional_tests/multisig.py
index b109acf91..7d73a5d71 100755
--- a/tests/functional_tests/multisig.py
+++ b/tests/functional_tests/multisig.py
@@ -46,6 +46,8 @@ class MultisigTest():
         self.mine('4ADHswEU3XBUee8pudBkZQd9beJainqNo1BQKkHJujAEPJyQrLj9U4dNm8HEMdHuWwKMFGzMUB3RCTvcTaW9kHpdRUDxgjW', 5)
         self.mine('42ey1afDFnn4886T7196doS9GPMzexD9gXpsZJDwVjeRVdFCSoHnv7KPbBeGpzJBzHRCAs9UxqeoyFQMYbqSWYTfJJQAWDm', 60)
 
+        self.test_states()
+
         self.create_multisig_wallets(2, 2, '493DsrfJPqiN3Suv9RcRDoZEbQtKZX1sNcGPA3GhkKYEEmivk8kjQrTdRdVc4ZbmzWJuE157z9NNUKmF2VDfdYDR3CziGMk')
         self.import_multisig_info([1, 0], 5)
         txid = self.transfer([1, 0])
@@ -152,6 +154,72 @@ class MultisigTest():
         assert res.threshold == M_threshold
         assert res.total == N_total
 
+    def test_states(self):
+        print('Testing multisig states')
+        seeds = [
+            'velvet lymph giddy number token physics poetry unquoted nibs useful sabotage limits benches lifestyle eden nitrogen anvil fewest avoid batch vials washing fences goat unquoted',
+            'peeled mixture ionic radar utopia puddle buying illness nuns gadget river spout cavernous bounced paradise drunk looking cottage jump tequila melting went winter adjust spout',
+            'dilute gutter certain antics pamphlet macro enjoy left slid guarded bogeys upload nineteen bomb jubilee enhanced irritate turnip eggs swung jukebox loudly reduce sedan slid',
+        ]
+        info = []
+        wallet = [None, None, None]
+        for i in range(3):
+            wallet[i] = Wallet(idx = i)
+            try: wallet[i].close_wallet()
+            except: pass
+            res = wallet[i].restore_deterministic_wallet(seed = seeds[i])
+            res = wallet[i].is_multisig()
+            assert not res.multisig
+            res = wallet[i].prepare_multisig()
+            assert len(res.multisig_info) > 0
+            info.append(res.multisig_info)
+
+        for i in range(3):
+            ok = False
+            try: res = wallet[i].finalize_multisig(info)
+            except: ok = True
+            assert ok
+            ok = False
+            try: res = wallet[i].exchange_multisig_keys(info)
+            except: ok = True
+            assert ok
+            res = wallet[i].is_multisig()
+            assert not res.multisig
+
+        res = wallet[0].make_multisig(info[0:2], 2)
+        res = wallet[0].is_multisig()
+        assert res.multisig
+        assert res.ready
+
+        ok = False
+        try: res = wallet[0].finalize_multisig(info)
+        except: ok = True
+        assert ok
+
+        ok = False
+        try: res = wallet[0].prepare_multisig()
+        except: ok = True
+        assert ok
+
+        ok = False
+        try: res = wallet[0].make_multisig(info[0:2], 2)
+        except: ok = True
+        assert ok
+
+        res = wallet[1].make_multisig(info, 2)
+        res = wallet[1].is_multisig()
+        assert res.multisig
+        assert not res.ready
+
+        ok = False
+        try: res = wallet[1].prepare_multisig()
+        except: ok = True
+        assert ok
+
+        ok = False
+        try: res = wallet[1].make_multisig(info[0:2], 2)
+        except: ok = True
+        assert ok
 
     def import_multisig_info(self, signers, expected_outputs):
         assert len(signers) >= 2
diff --git a/utils/python-rpc/framework/wallet.py b/utils/python-rpc/framework/wallet.py
index 9090c01b8..cfffb32a8 100644
--- a/utils/python-rpc/framework/wallet.py
+++ b/utils/python-rpc/framework/wallet.py
@@ -480,6 +480,18 @@ class Wallet(object):
         }
         return self.rpc.send_json_rpc_request(make_multisig)
 
+    def finalize_multisig(self, multisig_info, password = ''):
+        finalize_multisig = {
+            'method': 'finalize_multisig',
+            'params' : {
+                'multisig_info': multisig_info,
+                'password': password,
+            },
+            'jsonrpc': '2.0',
+            'id': '0'
+        }
+        return self.rpc.send_json_rpc_request(finalize_multisig)
+
     def exchange_multisig_keys(self, multisig_info, password = ''):
         exchange_multisig_keys = {
             'method': 'exchange_multisig_keys',