move VariableLocation to variable.py

Author: nsiregar

slither/core/variables/local_variable.py

@@ -1,24 +1,15 @@
-import enum
 from typing import TYPE_CHECKING, Optional
 
 from slither.core.declarations.structure import Structure
 from slither.core.solidity_types.elementary_type import ElementaryType
 from slither.core.solidity_types.mapping_type import MappingType
 from slither.core.solidity_types.user_defined_type import UserDefinedType
-from slither.core.variables.variable import Variable
+from slither.core.variables.variable import Variable, VariableLocation
 
 if TYPE_CHECKING:  # type: ignore
     from slither.core.declarations import Function
 
 
-class VariableLocation(enum.Enum):
-    MEMORY = "memory"
-    CALLDATA = "calldata"
-    STORAGE = "storage"
-    REFERENCE_TO_STORAGE = "reference_to_storage"
-    TRANSIENT = "transient"
-
-
 class LocalVariable(Variable):
     def __init__(self) -> None:
         super().__init__()

slither/core/variables/state_variable.py

@@ -1,8 +1,7 @@
 from typing import TYPE_CHECKING, Optional
 
 from slither.core.declarations.contract_level import ContractLevel
-from slither.core.variables.local_variable import VariableLocation
-from slither.core.variables.variable import Variable
+from slither.core.variables.variable import Variable, VariableLocation
 
 if TYPE_CHECKING:
     from slither.core.cfg.node import Node

slither/core/variables/variable.py

@@ -2,6 +2,7 @@
     Variable module
 """
 from typing import Optional, TYPE_CHECKING, List, Union, Tuple
+from enum import Enum
 
 from slither.core.source_mapping.source_mapping import SourceMapping
 from slither.core.solidity_types.type import Type
@@ -11,6 +12,16 @@
     from slither.core.expressions.expression import Expression
     from slither.core.declarations import Function
 
+
+class VariableLocation(Enum):
+    DEFAULT = "default"
+    MEMORY = "memory"
+    CALLDATA = "calldata"
+    STORAGE = "storage"
+    REFERENCE_TO_STORAGE = "reference_to_storage"
+    TRANSIENT = "transient"
+
+
 # pylint: disable=too-many-instance-attributes
 class Variable(SourceMapping):
     def __init__(self) -> None:

tests/unit/slithir/test_ssa_generation.py

@@ -12,8 +12,9 @@
 from slither.core.cfg.node import Node, NodeType
 from slither.core.declarations import Contract, Function
 from slither.core.solidity_types import ArrayType, ElementaryType
-from slither.core.variables.local_variable import LocalVariable, VariableLocation
+from slither.core.variables.local_variable import LocalVariable
 from slither.core.variables.state_variable import StateVariable
+from slither.core.variables.variable import VariableLocation
 from slither.slithir.operations import (
     Assignment,
     Binary,