Skip to content

Removed Network.owner_id because it was redundant #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johny-b wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed Network.owner_id because it was redundant #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions yapapi/engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import aiohttp
import asyncio
from asyncio import CancelledError
from collections import defaultdict
Expand Down Expand Up @@ -251,14 +250,6 @@ def report_shutdown(*exc_info):
net_client = await stack.enter_async_context(self._api_config.net())
self._net_api = rest.Net(net_client)

# TODO replace with a proper REST API client once ya-client and ya-aioclient are updated
# https://github.com/golemfactory/yapapi/issues/636
self._root_api_session = await stack.enter_async_context(
aiohttp.ClientSession(
headers=net_client.default_headers,
)
)

self.payment_decorator = _Engine.PaymentDecorator(await self._create_allocations())

# TODO: make the method starting the process_invoices() task an async context manager
Expand Down
8 changes: 1 addition & 7 deletions yapapi/golem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import asyncio
from datetime import datetime, timedelta
from decimal import Decimal
import json
import sys
from typing import (
TYPE_CHECKING,
Expand Down Expand Up @@ -486,13 +485,8 @@ async def create_network(
:param mask: Optional netmask (only if not provided within the `ip` argument)
:param gateway: Optional gateway address for the network
"""
async with self._engine._root_api_session.get(
f"{self._engine._api_config.root_url}/me"
) as resp:
identity = json.loads(await resp.text()).get("identity")

return await Network.create(
self._engine._net_api, ip, identity, owner_ip, mask=mask, gateway=gateway
self._engine._net_api, ip, owner_ip, mask=mask, gateway=gateway
)

@staticmethod
Expand Down
8 changes: 1 addition & 7 deletions yapapi/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ async def create(
cls,
net_api: "yapapi.rest.net.Net",
ip: str,
owner_id: str,
owner_ip: Optional[str] = None,
mask: Optional[str] = None,
gateway: Optional[str] = None,
Expand All @@ -109,13 +108,12 @@ async def create(

:param net_api: the mid-level binding used directly to perform calls to the REST API.
:param ip: the IP address of the network. May contain netmask, e.g. "192.168.0.0/24"
:param owner_id: the node ID of the owner of this VPN (the requestor)
:param owner_ip: the desired IP address of the requestor node within the newly-created network
:param mask: Optional netmask (only if not provided within the `ip` argument)
:param gateway: Optional gateway address for the network
"""

network = cls(net_api, ip, owner_id, owner_ip, mask, gateway)
network = cls(net_api, ip, owner_ip, mask, gateway)
network._state_machine.create()

# create the network in yagna and set the id
Expand All @@ -134,15 +132,13 @@ def __init__(
self,
net_api: "yapapi.rest.net.Net",
ip: str,
owner_id: str,
owner_ip: Optional[str] = None,
mask: Optional[str] = None,
gateway: Optional[str] = None,
):
"""
:param net_api: the mid-level binding used directly to perform calls to the REST API.
:param ip: the IP address of the network. May contain netmask, e.g. "192.168.0.0/24"
:param owner_id: the node ID of the owner of this VPN (the requestor)
:param owner_ip: the desired IP address of the requestor node within the newly-created network
:param mask: Optional netmask (only if not provided within the `ip` argument)
:param gateway: Optional gateway address for the network
Expand All @@ -158,7 +154,6 @@ def __init__(

self._network_id: Optional[str] = None
self._gateway = gateway
self._owner_id = owner_id
self._owner_ip: IpAddress = ip_address(owner_ip) if owner_ip else self._next_address()
self._state_machine: NetworkState = NetworkState()

Expand Down Expand Up @@ -240,7 +235,6 @@ async def add_owner_address(self, ip: str):

async with self._nodes_lock:
self._ensure_ip_unique(ip)
self._nodes[self._owner_id] = Node(network=self, node_id=self._owner_id, ip=ip)

await self._net_api.add_address(self.network_id, ip)

Expand Down