Replace cytoolz with eth_utils.toolz

stringray55 · cburgdorf · commit 6abf21388397 · 2019-01-16T20:14:23.000+01:00
diff --git a/eth/_utils/datatypes.py b/eth/_utils/datatypes.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     assoc,
     groupby,
 )
diff --git a/eth/_utils/numeric.py b/eth/_utils/numeric.py
@@ -5,7 +5,7 @@
     Union,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 from eth_typing import (
diff --git a/eth/_utils/padding.py b/eth/_utils/padding.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 
diff --git a/eth/_utils/rlp.py b/eth/_utils/rlp.py
@@ -7,7 +7,7 @@
     Tuple,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 
diff --git a/eth/_utils/spoof.py b/eth/_utils/spoof.py
@@ -4,7 +4,7 @@
     Union,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     merge,
 )
 
diff --git a/eth/chains/tester/__init__.py b/eth/chains/tester/__init__.py
@@ -9,7 +9,7 @@
     Union,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     assoc,
     last,
 )
diff --git a/eth/db/header.py b/eth/db/header.py
@@ -4,7 +4,7 @@
 
 import rlp
 
-from cytoolz import (
+from eth_utils.toolz import (
     concat,
     first,
     sliding_window,
diff --git a/eth/db/journal.py b/eth/db/journal.py
@@ -2,7 +2,7 @@
 from typing import cast, Dict, Union  # noqa: F401
 import uuid
 
-from cytoolz import (
+from eth_utils.toolz import (
     first,
     merge,
     last,
diff --git a/eth/precompiles/ecpairing.py b/eth/precompiles/ecpairing.py
@@ -1,6 +1,6 @@
 from typing import Tuple
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
     pipe,
 )
diff --git a/eth/tools/_utils/mappings.py b/eth/tools/_utils/mappings.py
@@ -7,7 +7,7 @@
     Sequence,
 )
 
-from cytoolz import merge_with
+from eth_utils.toolz import merge_with
 
 
 def merge_if_dicts(values: Sequence[Dict[Any, Any]]) -> Any:
diff --git a/eth/tools/_utils/normalization.py b/eth/tools/_utils/normalization.py
@@ -15,15 +15,15 @@
     Union,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     assoc_in,
     compose,
     concat,
     curry,
     identity,
     merge,
 )
-import cytoolz.curried
+from eth_utils.toolz import curried
 
 from eth_typing import (
     Address,
@@ -232,14 +232,14 @@ def state_definition_to_dict(state_definition: GeneralState) -> AccountState:
 
 
 normalize_storage = compose(
-    cytoolz.curried.keymap(normalize_int),
-    cytoolz.curried.valmap(normalize_int),
+    curried.keymap(normalize_int),
+    curried.valmap(normalize_int),
 )
 
 
 normalize_state = compose(
-    cytoolz.curried.keymap(to_canonical_address),
-    cytoolz.curried.valmap(dict_normalizer({
+    curried.keymap(to_canonical_address),
+    curried.valmap(dict_normalizer({
         "balance": normalize_int,
         "code": normalize_bytes,
         "nonce": normalize_int,
diff --git a/eth/tools/builder/chain/builders.py b/eth/tools/builder/chain/builders.py
@@ -9,7 +9,7 @@
     Type,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
     merge,
     pipe,
diff --git a/eth/tools/fixtures/fillers/common.py b/eth/tools/fixtures/fillers/common.py
@@ -12,7 +12,7 @@
     List,
     Sequence,
 )
-from cytoolz import (
+from eth_utils.toolz import (
     assoc,
     assoc_in,
     curry,
diff --git a/eth/tools/fixtures/fillers/formatters.py b/eth/tools/fixtures/fillers/formatters.py
@@ -4,7 +4,8 @@
     to_checksum_address,
     to_hex,
 )
-import cytoolz.curried
+
+from eth_utils.toolz import curried
 import eth_utils.curried
 
 
@@ -19,7 +20,7 @@
 
 
 storage_item_formatter = apply_formatters_to_sequence([to_hex, to_hex])
-storage_formatter = cytoolz.curried.itemmap(storage_item_formatter)
+storage_formatter = curried.itemmap(storage_item_formatter)
 
 
 account_state_formatter = eth_utils.curried.apply_formatters_to_dict({
@@ -31,7 +32,7 @@
 
 
 state_item_formatter = apply_formatters_to_sequence([to_checksum_address, account_state_formatter])
-state_formatter = cytoolz.curried.itemmap(state_item_formatter)
+state_formatter = curried.itemmap(state_item_formatter)
 
 
 transaction_group_formatter = eth_utils.curried.apply_formatters_to_dict({
@@ -71,15 +72,15 @@
     "expect": expect_formatter,
     "exec": execution_formatter,
 })
-filler_formatter = cytoolz.curried.valmap(test_formatter)
+filler_formatter = curried.valmap(test_formatter)
 
 
 state_post_formatter = eth_utils.curried.apply_formatters_to_dict({
     "hash": encode_hex
 })
 
 
-filled_state_test_formatter = cytoolz.curried.valmap(eth_utils.curried.apply_formatters_to_dict({
+filled_state_test_formatter = curried.valmap(eth_utils.curried.apply_formatters_to_dict({
     "env": environment_formatter,
     "pre": state_formatter,
     "transaction": transaction_group_formatter,
@@ -94,7 +95,7 @@
 })
 call_creates_formatter = eth_utils.curried.apply_formatter_to_array(call_create_item_formatter)
 
-filled_vm_test_formatter = cytoolz.curried.valmap(eth_utils.curried.apply_formatters_to_dict({
+filled_vm_test_formatter = curried.valmap(eth_utils.curried.apply_formatters_to_dict({
     "env": environment_formatter,
     "pre": state_formatter,
     "exec": execution_formatter,
diff --git a/eth/tools/fixtures/fillers/main.py b/eth/tools/fixtures/fillers/main.py
@@ -3,7 +3,7 @@
     Dict,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     assoc_in,
     merge,
 )
diff --git a/eth/tools/fixtures/generation.py b/eth/tools/fixtures/generation.py
@@ -7,7 +7,7 @@
     Iterable,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
     identity,
 )
diff --git a/eth/tools/fixtures/helpers.py b/eth/tools/fixtures/helpers.py
@@ -10,7 +10,7 @@
     Type,
 )
 
-from cytoolz import first
+from eth_utils.toolz import first
 
 from eth_utils import (
     to_normalized_address,
diff --git a/eth/tools/fixtures/loading.py b/eth/tools/fixtures/loading.py
@@ -10,7 +10,7 @@
     Tuple,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
     identity,
 )
diff --git a/eth/validation.py b/eth/validation.py
@@ -19,18 +19,11 @@
 from eth_utils import (
     ValidationError,
 )
+from eth_utils.toolz import dicttoolz
 
-from cytoolz.dicttoolz import (
-    valfilter,
-)
-from cytoolz.functoolz import (
-    partial,
-    pipe,
-)
-from cytoolz.itertoolz import (
-    isdistinct,
-    frequencies,
-)
+from eth_utils.toolz import functoolz
+
+from eth_utils.toolz import itertoolz
 
 from eth.constants import (
     GAS_LIMIT_ADJUSTMENT_FACTOR,
@@ -213,11 +206,13 @@ def validate_stack_item(value: Union[int, bytes]) -> None:
 
 
 def validate_unique(values: Iterable[Any], title: str="Value") -> None:
-    if not isdistinct(values):
-        duplicates = pipe(
+    if not itertoolz.isdistinct(values):
+        duplicates = functoolz.pipe(
             values,
-            frequencies,  # get the frequencies
-            partial(valfilter, lambda v: v > 1),  # filter to ones that occure > 1
+            itertoolz.frequencies,  # get the frequencies
+
+            # filter to ones that occure > 1
+            functoolz.partial(dicttoolz.valfilter, lambda v: v > 1),
             sorted,  # sort them
             tuple,  # cast them to an immutiable form
         )
diff --git a/eth/vm/forks/byzantium/__init__.py b/eth/vm/forks/byzantium/__init__.py
@@ -2,7 +2,7 @@
     Type,
 )
 
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 
diff --git a/eth/vm/forks/byzantium/computation.py b/eth/vm/forks/byzantium/computation.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     merge,
 )
 
diff --git a/eth/vm/forks/byzantium/headers.py b/eth/vm/forks/byzantium/headers.py
@@ -2,7 +2,7 @@
     Any,
     Callable,
 )
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 from eth.constants import (
diff --git a/eth/vm/forks/byzantium/opcodes.py b/eth/vm/forks/byzantium/opcodes.py
@@ -1,7 +1,7 @@
 import copy
 import functools
 
-from cytoolz import merge
+from eth_utils.toolz import merge
 
 from typing import (
     Any,
diff --git a/eth/vm/forks/constantinople/computation.py b/eth/vm/forks/constantinople/computation.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     merge,
 )
 
diff --git a/eth/vm/forks/constantinople/opcodes.py b/eth/vm/forks/constantinople/opcodes.py
@@ -1,5 +1,5 @@
 import copy
-from cytoolz import (
+from eth_utils.toolz import (
     merge
 )
 
diff --git a/eth/vm/forks/homestead/opcodes.py b/eth/vm/forks/homestead/opcodes.py
@@ -1,6 +1,6 @@
 import copy
 
-from cytoolz import merge
+from eth_utils.toolz import merge
 
 from eth import constants
 from eth.vm import mnemonics
diff --git a/eth/vm/forks/spurious_dragon/opcodes.py b/eth/vm/forks/spurious_dragon/opcodes.py
@@ -1,6 +1,6 @@
 import copy
 
-from cytoolz import merge
+from eth_utils.toolz import merge
 
 from eth.vm.forks.tangerine_whistle.constants import (
     GAS_SELFDESTRUCT_EIP150,
diff --git a/eth/vm/forks/tangerine_whistle/opcodes.py b/eth/vm/forks/tangerine_whistle/opcodes.py
@@ -1,6 +1,6 @@
 import copy
 
-from cytoolz import merge
+from eth_utils.toolz import merge
 
 from eth.vm.forks.tangerine_whistle import constants
 from eth.constants import GAS_CREATE
diff --git a/eth/vm/logic/arithmetic.py b/eth/vm/logic/arithmetic.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     curry,
 )
 
diff --git a/tests/core/builder-tools/test_chain_initializer.py b/tests/core/builder-tools/test_chain_initializer.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from cytoolz import pipe
+from eth_utils.toolz import pipe
 
 from eth import constants
 from eth.chains.base import Chain
diff --git a/tests/core/chain-object/test_contract_call.py b/tests/core/chain-object/test_contract_call.py
@@ -1,4 +1,4 @@
-from cytoolz import (
+from eth_utils.toolz import (
     assoc,
 )
 from tests.core.helpers import (
diff --git a/tests/core/helpers.py b/tests/core/helpers.py
@@ -1,6 +1,6 @@
 import sys
 
-from cytoolz import curry
+from eth_utils.toolz import curry
 
 import pytest
 
diff --git a/tests/core/vm/test_mainnet_dao_fork.py b/tests/core/vm/test_mainnet_dao_fork.py
@@ -5,7 +5,7 @@
     ValidationError,
 )
 
-from cytoolz import sliding_window
+from eth_utils.toolz import sliding_window
 
 from eth.chains.mainnet import (
     MainnetHomesteadVM,
diff --git a/tests/database/test_header_db.py b/tests/database/test_header_db.py
@@ -3,7 +3,7 @@
 
 import pytest
 
-from cytoolz import accumulate
+from eth_utils.toolz import accumulate
 
 from eth_utils import (
     to_tuple,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from cytoolz import (`
	`1`	`+from eth_utils.toolz import (`
`2`	`2`	`assoc,`
`3`	`3`	`groupby,`
`4`	`4`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`Union,`
`6`	`6`	`)`
`7`	`7`
`8`		`-from cytoolz import (`
	`8`	`+from eth_utils.toolz import (`
`9`	`9`	`curry,`
`10`	`10`	`)`
`11`	`11`	`from eth_typing import (`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`Tuple,`
`8`	`8`	`)`
`9`	`9`
`10`		`-from cytoolz import (`
	`10`	`+from eth_utils.toolz import (`
`11`	`11`	`curry,`
`12`	`12`	`)`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`Union,`
`5`	`5`	`)`
`6`	`6`
`7`		`-from cytoolz import (`
	`7`	`+from eth_utils.toolz import (`
`8`	`8`	`merge,`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`Union,`
`10`	`10`	`)`
`11`	`11`
`12`		`-from cytoolz import (`
	`12`	`+from eth_utils.toolz import (`
`13`	`13`	`assoc,`
`14`	`14`	`last,`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`from typing import Tuple`
`2`	`2`
`3`		`-from cytoolz import (`
	`3`	`+from eth_utils.toolz import (`
`4`	`4`	`curry,`
`5`	`5`	`pipe,`
`6`	`6`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`Sequence,`
`8`	`8`	`)`
`9`	`9`
`10`		`-from cytoolz import merge_with`
	`10`	`+from eth_utils.toolz import merge_with`
`11`	`11`
`12`	`12`
`13`	`13`	`def merge_if_dicts(values: Sequence[Dict[Any, Any]]) -> Any:`