From 04765b10f2d79b8d32ee34178f9aafe2bbb8787e Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 14 Oct 2022 18:37:00 +0200
Subject: [PATCH] Move network_tools.py to network.py (#330)
---
silkaj/blockchain/blocks.py | 2 +-
silkaj/blockchain/difficulty.py | 5 ++---
silkaj/blockchain/information.py | 2 +-
silkaj/blockchain/tools.py | 2 +-
silkaj/blockchain/verify.py | 2 +-
silkaj/cert.py | 2 +-
silkaj/idty_tools.py | 2 +-
silkaj/membership.py | 2 +-
silkaj/money/history.py | 2 +-
silkaj/money/tools.py | 2 +-
silkaj/money/transfer.py | 5 ++---
silkaj/{network_tools.py => network.py} | 0
silkaj/revocation.py | 7 +++----
silkaj/wot.py | 2 +-
silkaj/wot_tools.py | 2 +-
tests/blockchain/test_verify.py | 2 +-
tests/money/test_transfer.py | 8 ++++----
tests/test_membership.py | 2 +-
tests/{test_network_tools.py => test_network.py} | 10 +++++-----
tests/test_revocation.py | 2 +-
20 files changed, 30 insertions(+), 33 deletions(-)
rename silkaj/{network_tools.py => network.py} (100%)
rename tests/{test_network_tools.py => test_network.py} (91%)
diff --git a/silkaj/blockchain/blocks.py b/silkaj/blockchain/blocks.py
index e70f9fd5..563fb33d 100644
--- a/silkaj/blockchain/blocks.py
+++ b/silkaj/blockchain/blocks.py
@@ -25,7 +25,7 @@ from pendulum import from_timestamp
from silkaj import tui
from silkaj.blockchain.tools import get_head_block
from silkaj.constants import ALL
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from silkaj.wot_tools import identity_of
diff --git a/silkaj/blockchain/difficulty.py b/silkaj/blockchain/difficulty.py
index e6bccdb3..09861647 100644
--- a/silkaj/blockchain/difficulty.py
+++ b/silkaj/blockchain/difficulty.py
@@ -25,9 +25,8 @@ from duniterpy.api.client import WSConnection
from pendulum import from_timestamp
from websocket._exceptions import WebSocketConnectionClosedException
-from silkaj import tui
+from silkaj import network, tui
from silkaj.constants import ALL
-from silkaj.network_tools import client_instance
@click.command(
@@ -35,7 +34,7 @@ from silkaj.network_tools import client_instance
help="Display the current Proof of Work difficulty level to generate the next block",
)
def difficulties() -> None:
- client = client_instance()
+ client = network.client_instance()
try:
ws = client(bma.ws.block)
while True:
diff --git a/silkaj/blockchain/information.py b/silkaj/blockchain/information.py
index 093f060b..6a775cd6 100644
--- a/silkaj/blockchain/information.py
+++ b/silkaj/blockchain/information.py
@@ -18,7 +18,7 @@ from pendulum import from_timestamp
from silkaj.blockchain.tools import get_head_block
from silkaj.constants import ALL
-from silkaj.network_tools import determine_endpoint
+from silkaj.network import determine_endpoint
from silkaj.tools import get_currency_symbol
diff --git a/silkaj/blockchain/tools.py b/silkaj/blockchain/tools.py
index 71429585..82b89ac7 100644
--- a/silkaj/blockchain/tools.py
+++ b/silkaj/blockchain/tools.py
@@ -18,7 +18,7 @@ from typing import Dict
from duniterpy.api.bma import blockchain
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
@functools.lru_cache(maxsize=1)
diff --git a/silkaj/blockchain/verify.py b/silkaj/blockchain/verify.py
index 8922e56a..34d0afe9 100644
--- a/silkaj/blockchain/verify.py
+++ b/silkaj/blockchain/verify.py
@@ -23,7 +23,7 @@ from duniterpy.api.client import Client
from duniterpy.documents import Block
from silkaj.constants import BMA_MAX_BLOCKS_CHUNK_SIZE
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from silkaj.tools import message_exit
diff --git a/silkaj/cert.py b/silkaj/cert.py
index 614022a8..63470517 100644
--- a/silkaj/cert.py
+++ b/silkaj/cert.py
@@ -30,7 +30,7 @@ from silkaj.blockchain import tools as bc_tools
from silkaj.constants import ALL, DATE
from silkaj.crypto_tools import is_pubkey_and_check
from silkaj.g1_monetary_license import license_approval
-from silkaj.network_tools import client_instance, send_document
+from silkaj.network import client_instance, send_document
@click.command("cert", help="Send certification")
diff --git a/silkaj/idty_tools.py b/silkaj/idty_tools.py
index cc4215bc..5c65e289 100644
--- a/silkaj/idty_tools.py
+++ b/silkaj/idty_tools.py
@@ -26,7 +26,7 @@ from texttable import Texttable
from silkaj import wot_tools as wt
from silkaj.constants import ALL
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from silkaj.tui import gen_pubkey_checksum
diff --git a/silkaj/membership.py b/silkaj/membership.py
index 50882a2c..d65ce49c 100644
--- a/silkaj/membership.py
+++ b/silkaj/membership.py
@@ -26,7 +26,7 @@ from silkaj import auth, tui, wot
from silkaj.blockchain import tools as bc_tools
from silkaj.constants import DATE, SUCCESS_EXIT_STATUS
from silkaj.g1_monetary_license import license_approval
-from silkaj.network_tools import client_instance, send_document
+from silkaj.network import client_instance, send_document
@click.command(
diff --git a/silkaj/money/history.py b/silkaj/money/history.py
index 2a00e232..cffbfc17 100644
--- a/silkaj/money/history.py
+++ b/silkaj/money/history.py
@@ -32,7 +32,7 @@ from silkaj.money.tools import (
get_amount_from_pubkey,
get_ud_value,
)
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from silkaj.tools import get_currency_symbol
from silkaj.tui import Table, gen_pubkey_checksum
diff --git a/silkaj/money/tools.py b/silkaj/money/tools.py
index 01b982b5..2ec03b76 100644
--- a/silkaj/money/tools.py
+++ b/silkaj/money/tools.py
@@ -19,7 +19,7 @@ from typing import List, Tuple, Union
from duniterpy.api.bma import blockchain, tx
from duniterpy.documents.transaction import InputSource, OutputSource
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
def get_amount_from_pubkey(pubkey: str) -> List[int]:
diff --git a/silkaj/money/transfer.py b/silkaj/money/transfer.py
index ff7689c2..7390436c 100644
--- a/silkaj/money/transfer.py
+++ b/silkaj/money/transfer.py
@@ -33,8 +33,7 @@ from duniterpy.key import SigningKey
from silkaj import auth, cli_tools
from silkaj import crypto_tools as ct
-from silkaj import network_tools as nt
-from silkaj import tools, tui
+from silkaj import network, tools, tui
from silkaj.blockchain import tools as bc_tools
from silkaj.constants import (
CENT_MULT_TO_UNIT,
@@ -482,7 +481,7 @@ def generate_and_send_transaction(
OutputbackChange,
)
transaction.sign(key)
- nt.send_document(process, transaction)
+ network.send_document(process, transaction)
def display_sent_tx(outputAddress: str, amount: int) -> None:
diff --git a/silkaj/network_tools.py b/silkaj/network.py
similarity index 100%
rename from silkaj/network_tools.py
rename to silkaj/network.py
diff --git a/silkaj/revocation.py b/silkaj/revocation.py
index f0a0ae2f..4c677f9f 100644
--- a/silkaj/revocation.py
+++ b/silkaj/revocation.py
@@ -26,10 +26,9 @@ from duniterpy.documents.identity import Identity
from duniterpy.documents.revocation import Revocation
from duniterpy.key.verifying_key import VerifyingKey
-from silkaj import auth, idty_tools, tui, wot
+from silkaj import auth, idty_tools, network, tui, wot
from silkaj.blockchain.tools import get_currency
from silkaj.constants import FAILURE_EXIT_STATUS, SUCCESS_EXIT_STATUS
-from silkaj.network_tools import send_document
REVOCATION_LOCAL_PATH = "revocation.txt"
@@ -94,7 +93,7 @@ def revoke_now(ctx: click.Context) -> None:
click.echo(rev_doc.signed_raw())
warn_before_sending_document()
- send_document(bma.wot.revoke, rev_doc)
+ network.send_document(bma.wot.revoke, rev_doc)
@click.command(
@@ -147,7 +146,7 @@ def publish(ctx: click.Context, file: str) -> None:
click.echo(rev_doc.signed_raw())
warn_before_sending_document()
- send_document(bma.wot.revoke, rev_doc)
+ network.send_document(bma.wot.revoke, rev_doc)
def warn_before_dry_run_or_display(ctx: click.Context) -> None:
diff --git a/silkaj/wot.py b/silkaj/wot.py
index 24069230..50344aa4 100644
--- a/silkaj/wot.py
+++ b/silkaj/wot.py
@@ -25,7 +25,7 @@ from silkaj import wot_tools as wt
from silkaj.blockchain.tools import get_blockchain_parameters
from silkaj.constants import DATE
from silkaj.crypto_tools import is_pubkey_and_check
-from silkaj.network_tools import client_instance, exit_on_http_error
+from silkaj.network import client_instance, exit_on_http_error
from silkaj.tui import Table, gen_pubkey_checksum
diff --git a/silkaj/wot_tools.py b/silkaj/wot_tools.py
index 30249b09..b233f9ff 100644
--- a/silkaj/wot_tools.py
+++ b/silkaj/wot_tools.py
@@ -18,7 +18,7 @@ from urllib.error import HTTPError
from duniterpy.api.bma import wot
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
def identity_of(pubkey_uid: str) -> Dict:
diff --git a/tests/blockchain/test_verify.py b/tests/blockchain/test_verify.py
index d1ba48d2..3de8f20b 100644
--- a/tests/blockchain/test_verify.py
+++ b/tests/blockchain/test_verify.py
@@ -25,7 +25,7 @@ from silkaj.constants import (
FAILURE_EXIT_STATUS,
SUCCESS_EXIT_STATUS,
)
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
G1_INVALID_BLOCK_SIG = 15144
HEAD_BLOCK = 48000
diff --git a/tests/money/test_transfer.py b/tests/money/test_transfer.py
index f1cc31a1..07b3ab84 100644
--- a/tests/money/test_transfer.py
+++ b/tests/money/test_transfer.py
@@ -26,7 +26,7 @@ from duniterpy.documents.transaction import (
Unlock,
)
-from silkaj import auth, network_tools, tools, wot_tools
+from silkaj import auth, network, tools, wot_tools
from silkaj.blockchain import tools as bc_tools
from silkaj.cli import cli
from silkaj.constants import CENT_MULT_TO_UNIT, G1_SYMBOL
@@ -1224,11 +1224,11 @@ def test_generate_and_send_transaction(
):
# mock functions
transfer.generate_transaction_document = Mock()
- network_tools.send_document = Mock()
+ network.send_document = Mock()
# patched functions
monkeypatch.setattr(bc_tools, "get_head_block", patched_get_head_block)
- # monkeypatch.setattr(network_tools, "client_instance", patched_client_instance)
+ # monkeypatch.setattr(network, "client_instance", patched_client_instance)
transfer.generate_and_send_transaction(
key,
@@ -1259,7 +1259,7 @@ def test_generate_and_send_transaction(
Comment,
OutputbackChange,
)
- network_tools.send_document.assert_called_once()
+ network.send_document.assert_called_once()
# test check_transaction_values()
diff --git a/tests/test_membership.py b/tests/test_membership.py
index 8f1ed2e2..66e6e177 100644
--- a/tests/test_membership.py
+++ b/tests/test_membership.py
@@ -26,7 +26,7 @@ from silkaj import auth, membership, tui, wot
from silkaj.blockchain import tools as bc_tools
from silkaj.cli import cli
from silkaj.constants import DATE
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from tests.patched.blockchain_tools import (
currency,
fake_block_id,
diff --git a/tests/test_network_tools.py b/tests/test_network.py
similarity index 91%
rename from tests/test_network_tools.py
rename to tests/test_network.py
index 7f3d9de3..fe6326ad 100644
--- a/tests/test_network_tools.py
+++ b/tests/test_network.py
@@ -21,7 +21,7 @@ import pytest
# from duniterpy.api import bma
from duniterpy.api import endpoint as du_ep
-from silkaj import constants, network_tools
+from silkaj import constants, network
# from silkaj.membership import generate_membership_document
from tests import helpers
@@ -46,7 +46,7 @@ IPV6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334"
)
def test_determine_endpoint_custom(endpoint, host, ipv4, ipv6, port, path):
helpers.define_click_context(endpoint)
- ep = network_tools.determine_endpoint()
+ ep = network.determine_endpoint()
assert ep.host == host
assert ep.ipv4 == ipv4
assert ep.ipv6 == ipv6
@@ -64,13 +64,13 @@ def test_determine_endpoint_custom(endpoint, host, ipv4, ipv6, port, path):
)
def test_determine_endpoint(gtest, endpoint):
helpers.define_click_context(gtest=gtest)
- ep = network_tools.determine_endpoint()
+ ep = network.determine_endpoint()
assert ep == du_ep.endpoint(endpoint)
# def test_send_document_success(capsys):
# display = capsys.readouterr().out
-# network_tools.send_document()
+# network.send_document()
# def test_send_document_error(capsys):
@@ -80,7 +80,7 @@ def test_determine_endpoint(gtest, endpoint):
#
# #with patch("urllib.request.urlopen", side_effect=urllib.error.HTTPError):
# with patch("duniterpy.api.client.API.request_url", side_effect=urllib.error.HTTPError):
-# network_tools.send_document(bma.blockchain.membership, membership_doc)
+# network.send_document(bma.blockchain.membership, membership_doc)
#
# display = capsys.readouterr().out
# assert "Error while publishing Membership:" in display
diff --git a/tests/test_revocation.py b/tests/test_revocation.py
index 2bef87b6..4e282242 100644
--- a/tests/test_revocation.py
+++ b/tests/test_revocation.py
@@ -28,7 +28,7 @@ from silkaj import auth, idty_tools, revocation, wot
from silkaj.blockchain import tools as bc_tools
from silkaj.cli import cli
from silkaj.constants import FAILURE_EXIT_STATUS, SUCCESS_EXIT_STATUS
-from silkaj.network_tools import client_instance
+from silkaj.network import client_instance
from silkaj.tui import gen_pubkey_checksum
from tests.patched.auth import patched_auth_method
from tests.patched.blockchain_tools import patched_get_head_block_gtest
--
GitLab