From 20545ceacb1832dd45102e5a4cdbf8f1df8c3d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juozapas=20Bo=C4=8Dkus?= Date: Wed, 18 Dec 2024 16:30:49 +0200 Subject: [PATCH] Update NepTUN --- .unreleased/start_telio_with_tun_natlab_test | 0 Cargo.lock | 2 +- Cargo.toml | 2 +- nat-lab/tests/test_start_with_tun.py | 7 ++----- nat-lab/tests/uniffi/libtelio_remote.py | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 .unreleased/start_telio_with_tun_natlab_test diff --git a/.unreleased/start_telio_with_tun_natlab_test b/.unreleased/start_telio_with_tun_natlab_test new file mode 100644 index 000000000..e69de29bb diff --git a/Cargo.lock b/Cargo.lock index fab033e6f..6bfc249de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2602,7 +2602,7 @@ dependencies = [ [[package]] name = "neptun" version = "0.6.0" -source = "git+https://github.com/NordSecurity/neptun.git?branch=jj_uapi_buf_fix#8a3087beeb2c73cb4234c1602b25b8dde3157738" +source = "git+https://github.com/NordSecurity/neptun.git?tag=v1.0.2#b3b66795d748aa1720352a7b92204cc56d1c4daa" dependencies = [ "aead", "base64 0.13.1", diff --git a/Cargo.toml b/Cargo.toml index f94c5ac6a..9851fc321 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -173,7 +173,7 @@ windows = { version = "0.56", features = [ "Win32_NetworkManagement_IpHelper", ] } -neptun = { git = "https://github.com/NordSecurity/neptun.git", branch = "jj_uapi_buf_fix", features = ["device"] } +neptun = { git = "https://github.com/NordSecurity/neptun.git", tag = "v1.0.2", features = ["device"] } x25519-dalek = { version = "2.0.1", features = ["reusable_secrets", "static_secrets"] } diff --git a/nat-lab/tests/test_start_with_tun.py b/nat-lab/tests/test_start_with_tun.py index c8e20d9bf..21f74e6ce 100644 --- a/nat-lab/tests/test_start_with_tun.py +++ b/nat-lab/tests/test_start_with_tun.py @@ -1,10 +1,7 @@ -from typing import List from contextlib import AsyncExitStack from helpers import SetupParameters, ping_between_all_nodes, setup_mesh_nodes -from utils.bindings import ( - default_features, - TelioAdapterType, -) +from typing import List +from utils.bindings import default_features, TelioAdapterType from utils.connection_util import ConnectionTag diff --git a/nat-lab/tests/uniffi/libtelio_remote.py b/nat-lab/tests/uniffi/libtelio_remote.py index ab769a49a..e921341f5 100644 --- a/nat-lab/tests/uniffi/libtelio_remote.py +++ b/nat-lab/tests/uniffi/libtelio_remote.py @@ -1,10 +1,10 @@ import datetime import fcntl import os -import struct import Pyro5.api # type: ignore import Pyro5.server # type: ignore import shutil +import struct import sys import telio_bindings as libtelio # type: ignore # pylint: disable=import-error import time