rename create_new to create

Author: billbsing

convex_api/account.py

@@ -133,7 +133,7 @@ def address_checksum(self):
         return to_address_checksum(self.address)
 
     @staticmethod
-    def create_new():
+    def create():
         """
         Create a new account with a random key and address
 
@@ -143,9 +143,9 @@ def create_new():
         return Account(Ed25519PrivateKey.generate())
 
     @staticmethod
-    def create_from_bytes(value):
+    def import_from_bytes(value):
         """
-        Create the an account from a private key in bytes.
+        Import an account from a private key in bytes.
 
         :returns: Account object with the private/public key
 

tests/conftest.py

@@ -43,7 +43,7 @@ def test_account_info():
 
 @pytest.fixture(scope='module')
 def test_account(test_account_info):
-    return Account.create_from_bytes(test_account_info['private_bytes'])
+    return Account.import_from_bytes(test_account_info['private_bytes'])
 
 @pytest.fixture(scope='module')
 def convex_url():
@@ -56,6 +56,6 @@ def convex(convex_url):
 
 @pytest.fixture(scope='module')
 def other_account(convex):
-    account = Account.create_new()
+    account = Account.create()
     convex.topup_account(account)
     return account

tests/intergration/test_convex_api.py

@@ -41,12 +41,12 @@ def test_convex_api_request_funds(convex_url, test_account):
 
 def test_convex_api_topup_account(convex_url):
     convex = ConvexAPI(convex_url)
-    account = Account.create_new()
+    account = Account.create()
     topup_amount = TEST_FUNDING_AMOUNT
     amount = convex.topup_account(account, topup_amount)
     assert(amount >= topup_amount)
 
-    account = Account.create_new()
+    account = Account.create()
     amount = convex.topup_account(account)
     assert(amount >= 0)
 
@@ -59,7 +59,7 @@ def test_convex_get_account_info(convex_url, test_account):
     assert(info['sequence'] > 0)
 
 
-    account = Account.create_new()
+    account = Account.create()
     with pytest.raises(ConvexRequestError, match='Address does not exist'):
         info = convex.get_account_info(account)
 
@@ -86,21 +86,21 @@ def test_convex_api_send_basic_scrypt(convex_url, test_account):
 
 def test_convex_api_get_balance_no_funds(convex_url):
     convex = ConvexAPI(convex_url)
-    account = Account.create_new()
+    account = Account.create()
     new_balance = convex.get_balance(account)
     assert(new_balance == 0)
 
 def test_convex_api_get_balance_small_funds(convex_url, test_account):
     convex = ConvexAPI(convex_url)
-    account = Account.create_new()
+    account = Account.create()
     amount = 100
     request_amount = convex.request_funds(amount, account)
     new_balance = convex.get_balance(account)
     assert(new_balance == amount)
 
 def test_convex_api_get_balance_new_account(convex_url):
     convex = ConvexAPI(convex_url)
-    account = Account.create_new()
+    account = Account.create()
     amount = TEST_FUNDING_AMOUNT
     request_amount = convex.request_funds(amount, account)
     assert(request_amount == amount)
@@ -122,7 +122,7 @@ def test_convex_api_call(convex_url):
 )
 """
     convex = ConvexAPI(convex_url)
-    account = Account.create_new()
+    account = Account.create()
     amount = TEST_FUNDING_AMOUNT
     request_amount = convex.request_funds(amount, account)
     result = convex.send(deploy_storage, account)
@@ -158,8 +158,8 @@ def test_convex_api_call(convex_url):
 
 def test_convex_api_transfer(convex_url):
     convex = ConvexAPI(convex_url)
-    account_from = Account.create_new()
-    account_to = Account.create_new()
+    account_from = Account.create()
+    account_to = Account.create()
     amount = TEST_FUNDING_AMOUNT
     request_amount = convex.request_funds(amount, account_from)
     assert(request_amount == amount)

tests/unit/test_account.py

@@ -19,34 +19,34 @@
 SIGN_HASH_TEXT = '5bb1ce718241bfec110552b86bb7cccf0d95b8a5f462fbf6dff7c48543622ba5'
 SIGN_TEXT = '0x7eceffab47295be3891ea745838a99102bfaf525ec43632366c7ec3f54db4822b5d581573aecde94c420554f963baebbf412e4304ad8636886ddfa7b1049f70e'
 def test_account_create_new():
-    account = Account.create_new()
+    account = Account.create()
     assert(account)
     assert(account.address)
 
 
 def test_account_create_from_bytes(test_account_info):
-    account = Account.create_from_bytes(test_account_info['private_bytes'])
+    account = Account.import_from_bytes(test_account_info['private_bytes'])
     assert(account)
     assert(account.address == test_account_info['address'])
 
 def test_account_address_bytes(test_account_info):
-    account = Account.create_from_bytes(test_account_info['private_bytes'])
+    account = Account.import_from_bytes(test_account_info['private_bytes'])
     assert(account)
     assert(account.address_bytes == to_bytes(hexstr=test_account_info['address']))
 
 def test_account_address_api(test_account_info):
-    account = Account.create_from_bytes(test_account_info['private_bytes'])
+    account = Account.import_from_bytes(test_account_info['private_bytes'])
     assert(account)
     assert(account.address_api == remove_0x_prefix(test_account_info['address']))
 
 def test_account_address_checksum(test_account_info):
-    account = Account.create_from_bytes(test_account_info['private_bytes'])
+    account = Account.import_from_bytes(test_account_info['private_bytes'])
     assert(account)
     assert(account.address_checksum.lower() == test_account_info['address'])
 
 def test_account_sign(test_account_info):
     hash_text = SIGN_HASH_TEXT
-    account = Account.create_from_bytes(test_account_info['private_bytes'])
+    account = Account.import_from_bytes(test_account_info['private_bytes'])
     sign_data = account.sign(hash_text)
     assert(sign_data == SIGN_TEXT)