repair conflicts

Author: wolovim

web3/_utils/method_formatters.py

@@ -81,9 +81,9 @@
 )
 from web3.exceptions import (
     BlockNotFound,
+    InvalidParityMode,
     SolidityError,
     TransactionNotFound,
-    InvalidParityMode,
 )
 from web3.types import (
     BlockIdentifier,

web3/parity.py

@@ -2,10 +2,7 @@
     Callable,
     List,
     Optional,
-<<<<<<< HEAD
-=======
     Tuple,
->>>>>>> Add typing to parity module
     Union,
 )
 
@@ -106,13 +103,8 @@ def list_storage_keys_munger(
         address: Union[Address, ChecksumAddress, ENS, Hash32],
         quantity: int,
         hash_: Hash32,
-<<<<<<< HEAD
         block_identifier: Optional[BlockIdentifier] = None,
-    ) -> List[Hash32]:
-=======
-        block_identifier: Optional[BlockIdentifier]=None,
     ) -> Tuple[Union[Address, ChecksumAddress, ENS, Hash32], int, Hash32, BlockIdentifier]:
->>>>>>> Add typing to parity module
         if block_identifier is None:
             block_identifier = self.defaultBlock
         return (address, quantity, hash_, block_identifier)
@@ -133,7 +125,7 @@ def list_storage_keys_munger(
     )
 
     def trace_replay_transaction_munger(
-        self, block_identifier: Union[_Hash32, BlockIdentifier], mode: ParityTraceMode=['trace']
+        self, block_identifier: Union[_Hash32, BlockIdentifier], mode: ParityTraceMode = ['trace']
     ) -> Tuple[Union[BlockIdentifier, _Hash32], ParityTraceMode]:
         return (block_identifier, mode)
 
@@ -165,8 +157,8 @@ def trace_replay_transaction_munger(
     def trace_call_munger(
         self,
         transaction: TxParams,
-        mode: ParityTraceMode=['trace'],
-        block_identifier: Optional[BlockIdentifier]=None
+        mode: ParityTraceMode = ['trace'],
+        block_identifier: Optional[BlockIdentifier] = None
     ) -> Tuple[TxParams, ParityTraceMode, BlockIdentifier]:
         # TODO: move to middleware
         if 'from' not in transaction and is_checksum_address(self.web3.eth.defaultAccount):
@@ -184,7 +176,7 @@ def trace_call_munger(
     )
 
     def trace_transactions_munger(
-        self, raw_transaction: HexStr, mode: ParityTraceMode=['trace']
+        self, raw_transaction: HexStr, mode: ParityTraceMode = ['trace']
     ) -> Tuple[HexStr, ParityTraceMode]:
         return (raw_transaction, mode)