Fix errors in db_helper (#60)

* Fix errors in db_helper

* Update db_helper test

Author: LadyChristina

tests/test_map.py

@@ -55,7 +55,7 @@ def test_fill_db_with_balances(mocker):
     assert db_insert_address_without_update_mock.call_args_list == [call('connector', 'bitcoin', 'addr1'), call('connector', 'bitcoin', 'addr2')]
     assert db_insert_balance_mock.call_args_list == [call('connector', 'bitcoin', '2010-01-01', 'addr1', 100), call('connector', 'bitcoin', '2010-01-01', 'addr2', 200)]
     assert db_update_circulation_mock.call_args_list == [call('connector', 'bitcoin', '2010-01-01', 300)]
-    assert db_commit_mock.call_args_list == [call()]
+    assert db_commit_mock.call_args_list == [call('connector')]
 
     db_insert_address_without_update_mock.reset_mock()
     db_insert_snapshot_mock.reset_mock()
@@ -70,7 +70,7 @@ def test_fill_db_with_balances(mocker):
     assert db_insert_address_without_update_mock.call_args_list == [call('connector', 'ethereum', 'addr2')]
     assert db_insert_balance_mock.call_args_list == [call('connector', 'ethereum', '2010-01-01', 'addr2', 1)]
     assert db_update_circulation_mock.call_args_list == [call('connector', 'ethereum', '2010-01-01', 1)]
-    assert db_commit_mock.call_args_list == [call()]
+    assert db_commit_mock.call_args_list == [call('connector')]
 
 
 def test_apply_mapping(mocker):

tokenomics_decentralization/db_helper.py

@@ -35,7 +35,7 @@ def insert_ledger(conn, ledger):
 
     try:
         cursor.execute("INSERT INTO ledgers(name) VALUES (?)", (ledger, ))
-        commit_database()
+        commit_database(conn)
     except sqlite3.IntegrityError as e:
         if 'UNIQUE constraint failed' in str(e):
             pass
@@ -63,7 +63,7 @@ def insert_entity(conn, ledger, entity):
     ledger_id = get_ledger_id(conn, ledger)
     try:
         cursor.execute("INSERT INTO entities(name, ledger_id) VALUES (?, ?)", (entity, ledger_id))
-        commit_database()
+        commit_database(conn)
     except sqlite3.IntegrityError as e:
         if 'UNIQUE constraint failed' in str(e):
             pass
@@ -92,7 +92,7 @@ def insert_update_address(conn, ledger, address, entity, is_contract):
     entity_id = cursor.execute("SELECT id FROM entities WHERE name=? AND ledger_id=?", (entity, ledger_id)).fetchone()[0]
 
     try:
-        cursor.execute("INSERT INTO addresses(name, ledger_id, entity_id, is_contract) VALUES (?, ?, ?)", (address, ledger_id, entity_id, is_contract))
+        cursor.execute("INSERT INTO addresses(name, ledger_id, entity_id, is_contract) VALUES (?, ?, ?, ?)", (address, ledger_id, entity_id, is_contract))
     except sqlite3.IntegrityError as e:
         if 'UNIQUE constraint failed' in str(e):
             cursor.execute("UPDATE addresses SET entity_id=?, is_contract=? WHERE name=? AND ledger_id=?", (entity_id, is_contract, address, ledger_id))

tokenomics_decentralization/map.py

@@ -21,7 +21,7 @@ def fill_db_with_addresses(conn, ledger):
                 is_contract = 'is_contract' in info.keys() and info['is_contract']
 
                 db_hlp.insert_update_address(conn, ledger, addr, entity, is_contract)
-        db_hlp.commit_database()
+        db_hlp.commit_database(conn)
     except FileNotFoundError:
         return
 
@@ -51,7 +51,7 @@ def fill_db_with_balances(conn, ledger, snapshot):
                     db_hlp.insert_balance(conn, ledger, snapshot, address, balance)
 
                 db_hlp.update_circulation(conn, ledger, snapshot, circulation)
-                db_hlp.commit_database()
+                db_hlp.commit_database(conn)
             return