Shortened Function

dataserv/Farmer.py

@@ -32,7 +32,7 @@ def validate(self):
         # check if this is a valid BTC address or not
         if not self.is_btc_address():
             raise ValueError("Invalid BTC Address.")
-        elif self.address_exists():
+        elif self.exists():
             raise ValueError("Address Already Is Registered.")
 
     def is_btc_address(self):
@@ -75,6 +75,6 @@ def register(self):
         db.session.add(self)
         db.session.commit()
 
-    def address_exists(self):
+    def exists(self):
         """Check to see if this address is already listed."""
         return db.session.query(Farmer.btc_addr).filter(Farmer.btc_addr==self.btc_addr).count() > 0

tests/test_Farmer.py

@@ -53,9 +53,9 @@ def test_register(self):
         farmer2 = Farmer(addr2)
         farmer3 = Farmer(addr3)
 
-        self.assertFalse(farmer1.address_exists())
+        self.assertFalse(farmer1.exists())
         farmer1.register()
-        self.assertTrue(farmer1.address_exists())
+        self.assertTrue(farmer1.exists())
 
         # test duplicate
         self.assertRaises(ValueError, farmer1.register)
@@ -65,5 +65,5 @@ def test_register(self):
         self.assertRaises(ValueError, farmer3.register)
 
         # double check they are not in the db
-        self.assertFalse(farmer2.address_exists())
-        self.assertFalse(farmer3.address_exists())
+        self.assertFalse(farmer2.exists())
+        self.assertFalse(farmer3.exists())