additional input type tests

Author: F483

btctxstore/api.py

@@ -37,7 +37,7 @@ def validate_address(self, address):  # TODO test
         try:
             deserialize.address(self.testnet, address)
             return True
-        except exceptions.InvalidAddress:
+        except exceptions.InvalidInput:
             return False
 
     def get_address(self, wif):
@@ -48,7 +48,7 @@ def validate_key(self, wif):  # TODO test
         try:
             deserialize.key(self.testnet, wif)
             return True
-        except exceptions.InvalidWif:
+        except exceptions.InvalidInput:
             return False
 
     ###############

btctxstore/deserialize.py

@@ -32,6 +32,12 @@ def unicode_str(string):
     return string
 
 
+def string(s):
+    if type(s) != type("string"):
+        raise exceptions.InvalidInput("Must be a string!")
+    return s
+
+
 def tx(rawtx):
     return Tx.tx_from_hex(rawtx)
 
@@ -79,6 +85,7 @@ def txid(txhash):
 
 
 def address(testnet, address):
+    address = string(address)
     netcode = 'XTN' if testnet else 'BTC'
     if not validate.is_address_valid(address, allowable_netcodes=[netcode]):
         raise exceptions.InvalidAddress(address)
@@ -138,6 +145,7 @@ def secret_exponents(testnet, wifs):
 
 
 def key(testnet, wif):
+    wif = string(wif)
     netcode = 'XTN' if testnet else 'BTC'
     if not validate.is_wif_valid(wif, allowable_netcodes=[netcode]):
         raise exceptions.InvalidWif(wif)

tests/api.py

@@ -343,6 +343,9 @@ def test_invalid_network(self):
     def test_invalid_data(self):
         self.assertFalse(self.testnet_api.validate_address("f483"))
 
+    def test_invalid_type(self):
+        self.assertFalse(self.testnet_api.validate_address(None))
+
 
 class TestValidateAddressMainnet(unittest.TestCase):
 
@@ -361,6 +364,9 @@ def test_invalid_network(self):
     def test_invalid_data(self):
         self.assertFalse(self.mainnet_api.validate_address("f483"))
 
+    def test_invalid_type(self):
+        self.assertFalse(self.mainnet_api.validate_address(None))
+
 
 class TestValidateKeyTestnet(unittest.TestCase):
 
@@ -379,6 +385,9 @@ def test_invalid_network(self):
     def test_invalid_data(self):
         self.assertFalse(self.testnet_api.validate_key("f483"))
 
+    def test_invalid_type(self):
+        self.assertFalse(self.testnet_api.validate_key(None))
+
 
 class TestValidateKeyMainnet(unittest.TestCase):
 
@@ -397,6 +406,9 @@ def test_invalid_network(self):
     def test_invalid_data(self):
         self.assertFalse(self.mainnet_api.validate_key("f483"))
 
+    def test_invalid_type(self):
+        self.assertFalse(self.mainnet_api.validate_key(None))
+
 
 if __name__ == '__main__':
     unittest.main()

tests/deserialize.py

@@ -67,6 +67,26 @@ def callback():
             deserialize.key(True, mainnet_wif)
         self.assertRaises(exceptions.InvalidWif, callback)
 
+        # testnet non string
+        def callback():
+            deserialize.key(False, None)
+        self.assertRaises(exceptions.InvalidInput, callback)
+
+        # mainnet non string
+        def callback():
+            deserialize.key(True, None)
+        self.assertRaises(exceptions.InvalidInput, callback)
+
+        # testnet garbage string
+        def callback():
+            deserialize.key(False, "garbage")
+        self.assertRaises(exceptions.InvalidWif, callback)
+
+        # mainnet garbage string
+        def callback():
+            deserialize.key(True, "garbage")
+        self.assertRaises(exceptions.InvalidWif, callback)
+
 
 class TestAddress(unittest.TestCase):
 
@@ -91,3 +111,23 @@ def callback():
         def callback():
             deserialize.address(True, mainnet_address)
         self.assertRaises(exceptions.InvalidAddress, callback)
+
+        # non string testnet
+        def callback():
+            deserialize.address(False, None)
+        self.assertRaises(exceptions.InvalidInput, callback)
+
+        # non string mainnet
+        def callback():
+            deserialize.address(True, None)
+        self.assertRaises(exceptions.InvalidInput, callback)
+
+        # garbage string testnet
+        def callback():
+            deserialize.address(False, "garbage")
+        self.assertRaises(exceptions.InvalidAddress, callback)
+
+        # garbage string mainnet
+        def callback():
+            deserialize.address(True, "garbage")
+        self.assertRaises(exceptions.InvalidAddress, callback)