Rename TRACE log level to DEBUG2

Author: robert

eth/__init__.py

@@ -2,14 +2,14 @@
 import sys
 
 from eth.tools.logging import (
-    setup_trace_logging
+    setup_extended_logging
 )
 
 #
 #  Setup TRACE level logging.
 #
 # This needs to be done before the other imports
-setup_trace_logging()
+setup_extended_logging()
 
 from eth.chains import (  # noqa: F401
     Chain,

eth/db/account.py

@@ -49,7 +49,7 @@
     validate_canonical_address,
 )
 from eth.tools.logging import (
-    TraceLogger
+    ExtendedDebugLogger
 )
 from eth.utils.padding import (
     pad32,
@@ -178,7 +178,7 @@ def persist(self) -> None:
 
 class AccountDB(BaseAccountDB):
 
-    logger = cast(TraceLogger, logging.getLogger('eth.db.account.AccountDB'))
+    logger = cast(ExtendedDebugLogger, logging.getLogger('eth.db.account.AccountDB'))
 
     def __init__(self, db: BaseDB, state_root: Hash32=BLANK_ROOT_HASH) -> None:
         r"""
@@ -407,7 +407,7 @@ def commit(self, changeset: Tuple[UUID, UUID]) -> None:
         self._journaltrie.commit(trie_changeset)
 
     def make_state_root(self) -> Hash32:
-        self.logger.trace("Generating AccountDB trie")
+        self.logger.debug2("Generating AccountDB trie")
         self._journaldb.persist()
         self._journaltrie.persist()
         return self.state_root
@@ -428,7 +428,7 @@ def _log_pending_accounts(self) -> None:
                 else:
                     accounts_displayed.add(address)
                     account = self._get_account(Address(address))
-                    self.logger.trace(
+                    self.logger.debug2(
                         "Account %s: balance %d, nonce %d, storage root %s, code hash %s",
                         encode_hex(address),
                         account.balance,

eth/tools/logging.py

@@ -1,16 +1,16 @@
 import logging
 from typing import Any
 
-TRACE_LEVEL_NUM = 5
+DEBUG2_LEVEL_NUM = 8
 
 
-class TraceLogger(logging.Logger):
+class ExtendedDebugLogger(logging.Logger):
 
-    def trace(self, message: str, *args: Any, **kwargs: Any) -> None:
-        self.log(TRACE_LEVEL_NUM, message, *args, **kwargs)
+    def debug2(self, message: str, *args: Any, **kwargs: Any) -> None:
+        self.log(DEBUG2_LEVEL_NUM, message, *args, **kwargs)
 
 
-def setup_trace_logging() -> None:
-    logging.setLoggerClass(TraceLogger)
-    logging.addLevelName(TRACE_LEVEL_NUM, 'TRACE')
-    setattr(logging, 'TRACE', TRACE_LEVEL_NUM)  # typing: ignore
+def setup_extended_logging() -> None:
+    logging.setLoggerClass(ExtendedDebugLogger)
+    logging.addLevelName(DEBUG2_LEVEL_NUM, 'DEBUG2')
+    setattr(logging, 'DEBUG2', DEBUG2_LEVEL_NUM)  # typing: ignore

eth/vm/computation.py

@@ -30,7 +30,7 @@
     VMError,
 )
 from eth.tools.logging import (
-    TraceLogger,
+    ExtendedDebugLogger,
 )
 from eth.utils.datatypes import (
     Configurable,
@@ -117,7 +117,7 @@ class BaseComputation(Configurable, ABC):
     opcodes = None  # type: Dict[int, Any]
     _precompiles = None  # type: Dict[Address, Callable[['BaseComputation'], 'BaseComputation']]
 
-    logger = cast(TraceLogger, logging.getLogger('eth.vm.computation.Computation'))
+    logger = cast(ExtendedDebugLogger, logging.getLogger('eth.vm.computation.Computation'))
 
     def __init__(self,
                  state: BaseState,
@@ -214,7 +214,7 @@ def extend_memory(self, start_position: int, size: int) -> None:
         before_cost = memory_gas_cost(before_size)
         after_cost = memory_gas_cost(after_size)
 
-        self.logger.trace(
+        self.logger.debug2(
             "MEMORY: size (%s -> %s) | cost (%s -> %s)",
             before_size,
             after_size,
@@ -472,7 +472,7 @@ def get_log_entries(self) -> Tuple[Tuple[bytes, List[int], bytes], ...]:
     # Context Manager API
     #
     def __enter__(self) -> 'BaseComputation':
-        self.logger.trace(
+        self.logger.debug2(
             (
                 "COMPUTATION STARTING: gas: %s | from: %s | to: %s | value: %s "
                 "| depth %s | static: %s"
@@ -489,7 +489,7 @@ def __enter__(self) -> 'BaseComputation':
 
     def __exit__(self, exc_type: None, exc_value: None, traceback: None) -> None:
         if exc_value and isinstance(exc_value, VMError):
-            self.logger.trace(
+            self.logger.debug2(
                 (
                     "COMPUTATION ERROR: gas: %s | from: %s | to: %s | value: %s | "
                     "depth: %s | static: %s | error: %s"
@@ -515,7 +515,7 @@ def __exit__(self, exc_type: None, exc_value: None, traceback: None) -> None:
             # suppress VM exceptions
             return True
         elif exc_type is None:
-            self.logger.trace(
+            self.logger.debug2(
                 (
                     "COMPUTATION SUCCESS: from: %s | to: %s | value: %s | "
                     "depth: %s | static: %s | gas-used: %s | gas-remaining: %s"
@@ -563,7 +563,7 @@ def apply_computation(cls,
             for opcode in computation.code:
                 opcode_fn = computation.get_opcode_fn(opcode)
 
-                computation.logger.trace(
+                computation.logger.debug2(
                     "OPCODE: 0x%x (%s) | pc: %s",
                     opcode,
                     opcode_fn.mnemonic,

eth/vm/forks/frontier/computation.py

@@ -61,7 +61,7 @@ def apply_message(self) -> BaseComputation:
             self.state.account_db.delta_balance(self.msg.sender, -1 * self.msg.value)
             self.state.account_db.delta_balance(self.msg.storage_address, self.msg.value)
 
-            self.logger.trace(
+            self.logger.debug2(
                 "TRANSFERRED: %s from %s -> %s",
                 self.msg.value,
                 encode_hex(self.msg.sender),
@@ -101,7 +101,7 @@ def apply_create_message(self) -> BaseComputation:
                 except OutOfGas:
                     computation.output = b''
                 else:
-                    self.logger.trace(
+                    self.logger.debug2(
                         "SETTING CODE: %s -> length: %s | hash: %s",
                         encode_hex(self.msg.storage_address),
                         len(contract_code),

eth/vm/forks/frontier/state.py

@@ -77,7 +77,7 @@ def build_evm_message(self, transaction: BaseOrSpoofTransaction) -> Message:
             data = transaction.data
             code = self.vm_state.account_db.get_code(transaction.to)
 
-        self.vm_state.logger.trace(
+        self.vm_state.logger.debug2(
             (
                 "TRANSACTION: sender: %s | to: %s | value: %s | gas: %s | "
                 "gas-price: %s | s: %s | r: %s | v: %s | data-hash: %s"
@@ -123,7 +123,7 @@ def build_computation(self,
                         encode_hex(message.storage_address),
                     )
                 )
-                self.vm_state.logger.trace(
+                self.vm_state.logger.debug2(
                     "Address collision while creating contract: %s",
                     encode_hex(message.storage_address),
                 )
@@ -155,7 +155,7 @@ def finalize_computation(self,
         gas_refund_amount = (gas_refund + gas_remaining) * transaction.gas_price
 
         if gas_refund_amount:
-            self.vm_state.logger.trace(
+            self.vm_state.logger.debug2(
                 'TRANSACTION REFUND: %s -> %s',
                 gas_refund_amount,
                 encode_hex(computation.msg.sender),
@@ -166,7 +166,7 @@ def finalize_computation(self,
         # Miner Fees
         transaction_fee = \
             (transaction.gas - gas_remaining - gas_refund) * transaction.gas_price
-        self.vm_state.logger.trace(
+        self.vm_state.logger.debug2(
             'TRANSACTION FEE: %s -> %s',
             transaction_fee,
             encode_hex(self.vm_state.coinbase),
@@ -177,7 +177,7 @@ def finalize_computation(self,
         for account, beneficiary in computation.get_accounts_for_deletion():
             # TODO: need to figure out how we prevent multiple selfdestructs from
             # the same account and if this is the right place to put this.
-            self.vm_state.logger.trace('DELETING ACCOUNT: %s', encode_hex(account))
+            self.vm_state.logger.debug2('DELETING ACCOUNT: %s', encode_hex(account))
 
             # TODO: this balance setting is likely superflous and can be
             # removed since `delete_account` does this.

eth/vm/forks/homestead/computation.py

@@ -48,7 +48,7 @@ def apply_create_message(self) -> BaseComputation:
                     self.state.revert(snapshot)
                 else:
                     if self.logger:
-                        self.logger.trace(
+                        self.logger.debug2(
                             "SETTING CODE: %s -> length: %s | hash: %s",
                             encode_hex(self.msg.storage_address),
                             len(contract_code),

eth/vm/forks/spurious_dragon/computation.py

@@ -61,7 +61,7 @@ def apply_create_message(self) -> BaseComputation:
                     self.state.revert(snapshot)
                 else:
                     if self.logger:
-                        self.logger.trace(
+                        self.logger.debug2(
                             "SETTING CODE: %s -> length: %s | hash: %s",
                             encode_hex(self.msg.storage_address),
                             len(contract_code),

eth/vm/forks/spurious_dragon/state.py

@@ -34,7 +34,7 @@ def finalize_computation(self,
                 self.vm_state.account_db.account_is_empty(account)
             )
             if should_delete:
-                self.vm_state.logger.trace(
+                self.vm_state.logger.debug2(
                     "CLEARING EMPTY ACCOUNT: %s",
                     encode_hex(account),
                 )

eth/vm/gas_meter.py

@@ -13,7 +13,7 @@
     validate_uint256,
 )
 from eth.tools.logging import (
-    TraceLogger
+    ExtendedDebugLogger
 )
 
 
@@ -38,7 +38,7 @@ class GasMeter(object):
     gas_refunded = None  # type: int
     gas_remaining = None  # type: int
 
-    logger = cast(TraceLogger, logging.getLogger('eth.gas.GasMeter'))
+    logger = cast(ExtendedDebugLogger, logging.getLogger('eth.gas.GasMeter'))
 
     def __init__(self,
                  start_gas: int,
@@ -67,7 +67,7 @@ def consume_gas(self, amount: int, reason: str) -> None:
 
         self.gas_remaining -= amount
 
-        self.logger.trace(
+        self.logger.debug2(
             'GAS CONSUMPTION: %s - %s -> %s (%s)',
             self.gas_remaining + amount,
             amount,
@@ -81,7 +81,7 @@ def return_gas(self, amount: int) -> None:
 
         self.gas_remaining += amount
 
-        self.logger.trace(
+        self.logger.debug2(
             'GAS RETURNED: %s + %s -> %s',
             self.gas_remaining - amount,
             amount,
@@ -91,7 +91,7 @@ def return_gas(self, amount: int) -> None:
     def refund_gas(self, amount: int) -> None:
         self.gas_refunded = self.refund_strategy(self.gas_refunded, amount)
 
-        self.logger.trace(
+        self.logger.debug2(
             'GAS REFUND: %s + %s -> %s',
             self.gas_refunded - amount,
             amount,