From 3afb2e6f3da3ae51760cbed4b3f8632207ab9159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Tue, 14 Feb 2023 22:43:33 +0100 Subject: [PATCH] blackified with newest verion to satisfy CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- acceptance/python/src/test_naughty_strings.py | 3 +-- acceptance/python/src/test_zenroom.py | 2 -- integration/python/src/test_naughty_strings.py | 2 -- integration/python/src/test_zenroom.py | 1 - planetmint/backend/localmongodb/query.py | 1 - planetmint/backend/tarantool/transaction/tools.py | 2 -- planetmint/web/routes.py | 4 ++-- setup.py | 2 +- tests/assets/test_divisible_assets.py | 10 ---------- tests/assets/test_zenroom_signing.py | 1 - tests/db/test_planetmint_api.py | 1 - tests/test_config_utils.py | 1 - tests/upsert_validator/test_upsert_validator_vote.py | 4 +--- tests/web/test_assets.py | 2 -- tests/web/test_metadata.py | 1 - tests/web/test_transactions.py | 1 - 16 files changed, 5 insertions(+), 33 deletions(-) diff --git a/acceptance/python/src/test_naughty_strings.py b/acceptance/python/src/test_naughty_strings.py index a74f3fd..9e57084 100644 --- a/acceptance/python/src/test_naughty_strings.py +++ b/acceptance/python/src/test_naughty_strings.py @@ -67,6 +67,7 @@ skipped_naughty_strings = [ naughty_strings = [naughty for naughty in naughty_strings if naughty not in skipped_naughty_strings] + # This is our base test case, but we'll reuse it to send naughty strings as both keys and values. def send_naughty_tx(assets, metadata): # ## Set up a connection to Planetmint @@ -118,7 +119,6 @@ def send_naughty_tx(assets, metadata): @pytest.mark.parametrize("naughty_string", naughty_strings, ids=naughty_strings) def test_naughty_keys(naughty_string): - assets = [{"data": multihash(marshal({naughty_string: "nice_value"}))}] metadata = multihash(marshal({naughty_string: "nice_value"})) @@ -127,7 +127,6 @@ def test_naughty_keys(naughty_string): @pytest.mark.parametrize("naughty_string", naughty_strings, ids=naughty_strings) def test_naughty_values(naughty_string): - assets = [{"data": multihash(marshal({"nice_key": naughty_string}))}] metadata = multihash(marshal({"nice_key": naughty_string})) diff --git a/acceptance/python/src/test_zenroom.py b/acceptance/python/src/test_zenroom.py index 1b9ea14..543913a 100644 --- a/acceptance/python/src/test_zenroom.py +++ b/acceptance/python/src/test_zenroom.py @@ -19,7 +19,6 @@ def test_zenroom_signing( zenroom_script_input, condition_script_zencode, ): - biolabs = generate_keypair() version = "2.0" @@ -47,7 +46,6 @@ def test_zenroom_signing( zenroom_house_assets, condition_script_zencode, ): - biolabs = generate_keypair() version = "2.0" diff --git a/integration/python/src/test_naughty_strings.py b/integration/python/src/test_naughty_strings.py index 921d718..20f89e3 100644 --- a/integration/python/src/test_naughty_strings.py +++ b/integration/python/src/test_naughty_strings.py @@ -115,7 +115,6 @@ def send_naughty_tx(assets, metadata): @pytest.mark.parametrize("naughty_string", naughty_strings, ids=naughty_strings) def test_naughty_keys(naughty_string): - assets = [{"data": {naughty_string: "nice_value"}}] metadata = {naughty_string: "nice_value"} @@ -124,7 +123,6 @@ def test_naughty_keys(naughty_string): @pytest.mark.parametrize("naughty_string", naughty_strings, ids=naughty_strings) def test_naughty_values(naughty_string): - assets = [{"data": {"nice_key": naughty_string}}] metadata = {"nice_key": naughty_string} diff --git a/integration/python/src/test_zenroom.py b/integration/python/src/test_zenroom.py index 1f33ca0..cc0f6b3 100644 --- a/integration/python/src/test_zenroom.py +++ b/integration/python/src/test_zenroom.py @@ -17,7 +17,6 @@ def test_zenroom_signing( zenroom_script_input, condition_script_zencode, ): - biolabs = generate_keypair() version = "2.0" diff --git a/planetmint/backend/localmongodb/query.py b/planetmint/backend/localmongodb/query.py index 3351164..feaf145 100644 --- a/planetmint/backend/localmongodb/query.py +++ b/planetmint/backend/localmongodb/query.py @@ -102,7 +102,6 @@ def store_block(conn, block): @register_query(LocalMongoDBConnection) def get_txids_filtered(conn, asset_ids, operation=None, last_tx=None): - match = { Transaction.CREATE: {"operation": "CREATE", "id": {"$in": asset_ids}}, Transaction.TRANSFER: {"operation": "TRANSFER", "asset.id": {"$in": asset_ids}}, diff --git a/planetmint/backend/tarantool/transaction/tools.py b/planetmint/backend/tarantool/transaction/tools.py index afc4634..cb04b56 100644 --- a/planetmint/backend/tarantool/transaction/tools.py +++ b/planetmint/backend/tarantool/transaction/tools.py @@ -47,7 +47,6 @@ class TransactionDecompose: } def get_map(self, dictionary: dict = None): - return ( _save_keys_order(dictionary=dictionary) if dictionary is not None @@ -75,7 +74,6 @@ class TransactionDecompose: _inputs = [] input_index = 0 for _input in self._transaction["inputs"]: - _inputs.append( ( self._transaction["id"], diff --git a/planetmint/web/routes.py b/planetmint/web/routes.py index 3579c2e..05ad831 100644 --- a/planetmint/web/routes.py +++ b/planetmint/web/routes.py @@ -18,9 +18,9 @@ from planetmint.web.views import ( def add_routes(app): """Add the routes to an app""" - for (prefix, routes) in API_SECTIONS: + for prefix, routes in API_SECTIONS: api = Api(app, prefix=prefix) - for ((pattern, resource, *args), kwargs) in routes: + for (pattern, resource, *args), kwargs in routes: kwargs.setdefault("strict_slashes", False) api.add_resource(resource, pattern, *args, **kwargs) diff --git a/setup.py b/setup.py index accb392..8b8f2f9 100644 --- a/setup.py +++ b/setup.py @@ -94,7 +94,7 @@ dev_require = ["ipdb", "ipython", "watchdog", "logging_tree", "pre-commit", "twi tests_require = [ "coverage", "pep8", - "black", + "black>=23.1.0", "hypothesis>=5.3.0", "pytest>=3.0.0", "pytest-cov==2.8.1", diff --git a/tests/assets/test_divisible_assets.py b/tests/assets/test_divisible_assets.py index 60254bf..94f7030 100644 --- a/tests/assets/test_divisible_assets.py +++ b/tests/assets/test_divisible_assets.py @@ -34,7 +34,6 @@ def test_single_in_single_own_single_out_single_own_create(alice, user_pk, b): # Multiple outputs # Single owners_after per output def test_single_in_single_own_multiple_out_single_own_create(alice, user_pk, b): - tx = Create.generate( [alice.public_key], [([user_pk], 50), ([user_pk], 50)], @@ -55,7 +54,6 @@ def test_single_in_single_own_multiple_out_single_own_create(alice, user_pk, b): # Single output # Multiple owners_after def test_single_in_single_own_single_out_multiple_own_create(alice, user_pk, b): - tx = Create.generate( [alice.public_key], [([user_pk, user_pk], 100)], @@ -81,7 +79,6 @@ def test_single_in_single_own_single_out_multiple_own_create(alice, user_pk, b): # Mix: one output with a single owners_after, one output with multiple # owners_after def test_single_in_single_own_multiple_out_mix_own_create(alice, user_pk, b): - tx = Create.generate( [alice.public_key], [([user_pk], 50), ([user_pk, user_pk], 50)], @@ -130,7 +127,6 @@ def test_single_in_multiple_own_single_out_single_own_create(alice, b, user_pk, # Single output # Single owners_after def test_single_in_single_own_single_out_single_own_transfer(alice, b, user_pk, user_sk): - # CREATE divisible asset tx_create = Create.generate( [alice.public_key], [([user_pk], 100)], assets=[{"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"}] @@ -155,7 +151,6 @@ def test_single_in_single_own_single_out_single_own_transfer(alice, b, user_pk, # Multiple output # Single owners_after def test_single_in_single_own_multiple_out_single_own_transfer(alice, b, user_pk, user_sk): - # CREATE divisible asset tx_create = Create.generate( [alice.public_key], [([user_pk], 100)], assets=[{"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"}] @@ -183,7 +178,6 @@ def test_single_in_single_own_multiple_out_single_own_transfer(alice, b, user_pk # Single output # Multiple owners_after def test_single_in_single_own_single_out_multiple_own_transfer(alice, b, user_pk, user_sk): - # CREATE divisible asset tx_create = Create.generate( [alice.public_key], [([user_pk], 100)], assets=[{"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"}] @@ -219,7 +213,6 @@ def test_single_in_single_own_single_out_multiple_own_transfer(alice, b, user_pk # Mix: one output with a single owners_after, one output with multiple # owners_after def test_single_in_single_own_multiple_out_mix_own_transfer(alice, b, user_pk, user_sk): - # CREATE divisible asset tx_create = Create.generate( [alice.public_key], [([user_pk], 100)], assets=[{"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"}] @@ -448,7 +441,6 @@ def test_muiltiple_in_mix_own_multiple_out_mix_own_transfer(alice, b, user_pk, u # Single output # Single owners_after def test_multiple_in_different_transactions(alice, b, user_pk, user_sk): - # CREATE divisible asset # `b` creates a divisible asset and assigns 50 shares to `b` and # 50 shares to `user_pk` @@ -549,7 +541,6 @@ def test_threshold_same_public_key(alice, b, user_pk, user_sk): def test_sum_amount(alice, b, user_pk, user_sk): - # CREATE divisible asset with 3 outputs with amount 1 tx_create = Create.generate( [alice.public_key], @@ -575,7 +566,6 @@ def test_sum_amount(alice, b, user_pk, user_sk): def test_divide(alice, b, user_pk, user_sk): - # CREATE divisible asset with 1 output with amount 3 tx_create = Create.generate( [alice.public_key], [([user_pk], 3)], assets=[{"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"}] diff --git a/tests/assets/test_zenroom_signing.py b/tests/assets/test_zenroom_signing.py index 655d4fb..85263bf 100644 --- a/tests/assets/test_zenroom_signing.py +++ b/tests/assets/test_zenroom_signing.py @@ -52,7 +52,6 @@ metadata = {"units": 300, "type": "KG"} def test_zenroom_signing(): - biolabs = generate_key_pair() version = "3.0" diff --git a/tests/db/test_planetmint_api.py b/tests/db/test_planetmint_api.py index f0bcbc0..27e43c0 100644 --- a/tests/db/test_planetmint_api.py +++ b/tests/db/test_planetmint_api.py @@ -99,7 +99,6 @@ class TestBigchainApi(object): b.validate_transaction(tx) def test_write_transaction(self, b, user_sk, user_pk, alice, create_tx): - asset1 = {"data": "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4"} tx = Create.generate([alice.public_key], [([alice.public_key], 1)], assets=[asset1]).sign([alice.private_key]) diff --git a/tests/test_config_utils.py b/tests/test_config_utils.py index f537830..382066b 100644 --- a/tests/test_config_utils.py +++ b/tests/test_config_utils.py @@ -315,7 +315,6 @@ def test_write_config(): ), ) def test_database_envs(env_name, env_value, config_key, monkeypatch): - monkeypatch.setattr("os.environ", {env_name: env_value}) planetmint.config_utils.autoconfigure() diff --git a/tests/upsert_validator/test_upsert_validator_vote.py b/tests/upsert_validator/test_upsert_validator_vote.py index b0e649e..8aeb5a9 100644 --- a/tests/upsert_validator/test_upsert_validator_vote.py +++ b/tests/upsert_validator/test_upsert_validator_vote.py @@ -155,7 +155,6 @@ def test_valid_election_votes_received(b_mock, valid_upsert_validator_election, @pytest.mark.bdb def test_valid_election_conclude(b_mock, valid_upsert_validator_election, ed25519_node_keys): - # Node 0: cast vote tx_vote0 = gen_vote(valid_upsert_validator_election, 0, ed25519_node_keys) @@ -214,7 +213,6 @@ def test_valid_election_conclude(b_mock, valid_upsert_validator_election, ed2551 @pytest.mark.abci def test_upsert_validator(b, node_key, node_keys, ed25519_node_keys): - if b.get_latest_block()["height"] == 0: generate_block(b) @@ -343,6 +341,6 @@ def test_get_validator_update(b, node_keys, node_key, ed25519_node_keys): def reset_validator_set(b, node_keys, height): validators = [] - for (node_pub, _) in node_keys.items(): + for node_pub, _ in node_keys.items(): validators.append({"public_key": {"type": "ed25519-base64", "value": node_pub}, "voting_power": 10}) b.store_validator_set(height, validators) diff --git a/tests/web/test_assets.py b/tests/web/test_assets.py index 366b487..d22d802 100644 --- a/tests/web/test_assets.py +++ b/tests/web/test_assets.py @@ -24,7 +24,6 @@ def test_get_assets_with_missing_text_search(client): @pytest.mark.bdb def test_get_assets_tendermint(client, b, alice): - # test returns empty list when no assets are found res = client.get(ASSETS_ENDPOINT + "?search=abc") assert res.json == [] @@ -45,7 +44,6 @@ def test_get_assets_tendermint(client, b, alice): @pytest.mark.bdb def test_get_assets_limit_tendermint(client, b, alice): - # create two assets assets1 = [{"data": multihash(marshal({"msg": "abc 1"}))}] assets2 = [{"data": multihash(marshal({"msg": "abc 2"}))}] diff --git a/tests/web/test_metadata.py b/tests/web/test_metadata.py index bf3f6c8..c42b01b 100644 --- a/tests/web/test_metadata.py +++ b/tests/web/test_metadata.py @@ -48,7 +48,6 @@ def test_get_metadata_tendermint(client, b, alice): @pytest.mark.bdb def test_get_metadata_limit_tendermint(client, b, alice): - # create two assets assets1 = [{"data": multihash(marshal({"msg": "abc 1"}))}] meta1 = multihash(marshal({"key": "meta 1"})) diff --git a/tests/web/test_transactions.py b/tests/web/test_transactions.py index e4e8007..2ff1921 100644 --- a/tests/web/test_transactions.py +++ b/tests/web/test_transactions.py @@ -327,7 +327,6 @@ def test_post_invalid_transaction( @pytest.mark.abci def test_post_transfer_transaction_endpoint(client, user_pk, user_sk, posted_create_tx): - transfer_tx = Transfer.generate(posted_create_tx.to_inputs(), [([user_pk], 1)], asset_ids=[posted_create_tx.id]) transfer_tx = transfer_tx.sign([user_sk])