From 4a0d5d4014d26be0fa6911518de0a6f848a24bb1 Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Fri, 3 Jul 2020 23:46:09 +0300
Subject: [PATCH] Use list of tuples for multiple parameter BIP21 encoding
 tests

Dicts don't have guaranteed ordering.

Also now tests both with dicts and list of tuples for single parameter
tests.

All the actual code still use dicts, parameter order in BIP21 URI's in
real life should not matter.
---
 jmbitcoin/test/test_bip21.py | 61 ++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/jmbitcoin/test/test_bip21.py b/jmbitcoin/test/test_bip21.py
index 181e34e..1e9ae91 100644
--- a/jmbitcoin/test/test_bip21.py
+++ b/jmbitcoin/test/test_bip21.py
@@ -68,37 +68,47 @@ def test_bip21_encode():
         }) ==
         'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Luke-Jr'
     )
+    # Both dictionary and list of tuples should work
     assert(
-        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
-            'amount': 20.3,
-            'label': 'Luke-Jr'
-        }) ==
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('label', 'Luke-Jr')
+        ]) ==
+        'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?label=Luke-Jr'
+    )
+    # Use list of tuples version for multiple parameter tests, as dicts don't
+    # have guaranteed ordering.
+    assert(
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', 20.3),
+            ('label', 'Luke-Jr')
+        ]) ==
         'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=20.3&label=Luke-Jr'
     )
     assert(
-        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
-            'amount': 50,
-            'label': 'Luke-Jr',
-            'message': 'Donation for project xyz'
-        }) ==
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', 50),
+            ('label', 'Luke-Jr'),
+            ('message', 'Donation for project xyz')
+        ]) ==
         'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?amount=50&label=Luke-Jr&message=Donation%20for%20project%20xyz'
     )
     assert(
-        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
-            'req-somethingyoudontunderstand': 50,
-            'req-somethingelseyoudontget': 999
-        }) ==
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('req-somethingyoudontunderstand', 50),
+            ('req-somethingelseyoudontget', 999)
+        ]) ==
         'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?req-somethingyoudontunderstand=50&req-somethingelseyoudontget=999'
     )
     assert(
-        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
-            'somethingyoudontunderstand': 50,
-            'somethingelseyoudontget': 999
-        }) ==
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('somethingyoudontunderstand', 50),
+            ('somethingelseyoudontget', 999)
+        ]) ==
         'bitcoin:175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W?somethingyoudontunderstand=50&somethingelseyoudontget=999'
     )
     # Invalid amounts must raise ValueError
     with pytest.raises(ValueError):
+        # test dicts
         btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
             'amount': ''
         })
@@ -114,3 +124,20 @@ def test_bip21_encode():
         btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', {
             'amount': '100000000'
         })
+        # test list of tuples
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', '')
+        ])
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', 'XYZ')
+        ])
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', '100\'000')
+        ])
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', '100,000')
+        ])
+        btc.encode_bip21_uri('175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W', [
+            ('amount', '100000000')
+        ])
+