Merge pull request #274 from StellarCN/patch-v2.2

Patch v2.2.2

Author: overcat

stellar_sdk/memo.py

@@ -160,9 +160,9 @@ class HashMemo(Memo):
     def __init__(self, memo_hash: Union[bytes, str]) -> None:
         memo_hash = hex_to_bytes(memo_hash)
         length = len(memo_hash)
-        if length > 32:
+        if length != 32:
             raise MemoInvalidException(
-                "HashMemo can contain 32 bytes at max, got {:d} bytes".format(length)
+                "The length of HashMemo should be 32 bytes, got {:d} bytes.".format(length)
             )
 
         self.memo_hash: bytes = memo_hash
@@ -197,9 +197,9 @@ class ReturnHashMemo(Memo):
     def __init__(self, memo_return: bytes) -> None:
         memo_return = hex_to_bytes(memo_return)
         length = len(memo_return)
-        if length > 32:
+        if length != 32:
             raise MemoInvalidException(
-                "ReturnHashMemo can contain 32 bytes at max, got {:d} bytes".format(
+                "The length of ReturnHashMemo should be 32 bytes, got {:d} bytes.".format(
                     length
                 )
             )

stellar_sdk/time_bounds.py

@@ -24,7 +24,13 @@ class TimeBounds:
     """
 
     def __init__(self, min_time: int, max_time: int) -> None:
-        if 0 < max_time <= min_time:
+        if min_time < 0:
+            raise ValueError("min_time cannot be negative.")
+
+        if max_time < 0:
+            raise ValueError("max_time cannot be negative.")
+
+        if 0 < max_time < min_time:
             raise ValueError("max_time must be >= min_time.")
 
         self.min_time: int = min_time

tests/test_memo.py

@@ -76,20 +76,9 @@ def test_id_memo_invalid_raise(self, id):
         ):
             IdMemo(id)
 
-    @pytest.mark.parametrize(
-        "hex, xdr",
-        [
-            (
-                "90d38f2d64949bb64f693ff231f9a3b3",
-                "AAAAA5DTjy1klJu2T2k/8jH5o7MAAAAAAAAAAAAAAAAAAAAA",
-            ),
-            (
-                "573c10b148fc4bc7db97540ce49da22930f4bcd48a060dc7347be84ea9f52d9f",
-                "AAAAA1c8ELFI/EvH25dUDOSdoikw9LzUigYNxzR76E6p9S2f",
-            ),
-        ],
-    )
-    def test_hash_memo(self, hex, xdr):
+    def test_hash_memo(self):
+        hex = "573c10b148fc4bc7db97540ce49da22930f4bcd48a060dc7347be84ea9f52d9f"
+        xdr = "AAAAA1c8ELFI/EvH25dUDOSdoikw9LzUigYNxzR76E6p9S2f"
         hash = binascii.unhexlify(hex)
         memo = HashMemo(hash)
         assert memo.to_xdr_object().to_xdr() == xdr
@@ -102,24 +91,21 @@ def test_hash_memo_too_long_raise(self):
         length = 33
         with pytest.raises(
             MemoInvalidException,
-            match="HashMemo can contain 32 bytes at max, got {:d} bytes".format(length),
+            match="The length of HashMemo should be 32 bytes, got {:d} bytes.".format(length),
         ):
             HashMemo(os.urandom(length))
 
-    @pytest.mark.parametrize(
-        "hex, xdr",
-        [
-            (
-                "90d38f2d64949bb64f693ff231f9a3b3",
-                "AAAABJDTjy1klJu2T2k/8jH5o7MAAAAAAAAAAAAAAAAAAAAA",
-            ),
-            (
-                "573c10b148fc4bc7db97540ce49da22930f4bcd48a060dc7347be84ea9f52d9f",
-                "AAAABFc8ELFI/EvH25dUDOSdoikw9LzUigYNxzR76E6p9S2f",
-            ),
-        ],
-    )
-    def test_return_hash_memo(self, hex, xdr):
+    def test_hash_memo_too_short_raise(self):
+        length = 16
+        with pytest.raises(
+            MemoInvalidException,
+            match="The length of HashMemo should be 32 bytes, got {:d} bytes.".format(length),
+        ):
+            HashMemo(os.urandom(length))
+
+    def test_return_hash_memo(self):
+        hex = "573c10b148fc4bc7db97540ce49da22930f4bcd48a060dc7347be84ea9f52d9f"
+        xdr = "AAAABFc8ELFI/EvH25dUDOSdoikw9LzUigYNxzR76E6p9S2f"
         return_hash = binascii.unhexlify(hex)
         memo = ReturnHashMemo(return_hash)
         assert memo.to_xdr_object().to_xdr() == xdr
@@ -129,10 +115,20 @@ def test_return_hash_memo(self, hex, xdr):
         assert base_memo.to_xdr_object().to_xdr() == xdr
 
     def test_return_hash_memo_too_long_raise(self):
-        length = 33
+        length = 48
+        with pytest.raises(
+            MemoInvalidException,
+            match="The length of ReturnHashMemo should be 32 bytes, got {:d} bytes.".format(
+                length
+            ),
+        ):
+            ReturnHashMemo(os.urandom(length))
+
+    def test_return_hash_memo_too_short_raise(self):
+        length = 16
         with pytest.raises(
             MemoInvalidException,
-            match="ReturnHashMemo can contain 32 bytes at max, got {:d} bytes".format(
+            match="The length of ReturnHashMemo should be 32 bytes, got {:d} bytes.".format(
                 length
             ),
         ):

tests/test_time_bounds.py

@@ -9,6 +9,7 @@ class TestTimeBounds:
         [
             (1560844454, 1560846000, "AAAAAF0ImKYAAAAAXQiesA=="),
             (1560844454, 0, "AAAAAF0ImKYAAAAAAAAAAA=="),
+            (1583633108, 1583633108, "AAAAAF5kUtQAAAAAXmRS1A=="),
         ],
     )
     def test_to_xdr(self, min_time, max_time, xdr):
@@ -20,10 +21,13 @@ def test_to_xdr(self, min_time, max_time, xdr):
         assert from_instance.min_time == min_time
 
     @pytest.mark.parametrize(
-        "min_time, max_time", [(1560844454, 1560844454), (1560844454, 1)]
+        "min_time, max_time, message", [
+            (-1, 1560844454, "min_time cannot be negative."),
+            (1560844454, -1, "max_time cannot be negative."),
+            (1560844455, 156084454, "max_time must be >= min_time.")]
     )
-    def test_to_xdr_with_invalid_time_raise(self, min_time, max_time):
-        with pytest.raises(ValueError, match="max_time must be >= min_time."):
+    def test_to_xdr_with_invalid_time_raise(self, min_time, max_time, message):
+        with pytest.raises(ValueError, match=message):
             TimeBounds(min_time, max_time)
 
     def test_equals(self):