From 8c7e14e94307df40d1b7c6762e1f9459e0c98822 Mon Sep 17 00:00:00 2001 From: dawsh Date: Thu, 10 Oct 2024 17:25:38 +0330 Subject: [PATCH] fix some file names --- marznode/backends/{base.py => abstract_backend.py} | 0 .../backends/hysteria2/{interface.py => hysteria2_backend.py} | 2 +- marznode/backends/xray/{interface.py => xray_backend.py} | 2 +- marznode/marznode.py | 4 ++-- marznode/service/service.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename marznode/backends/{base.py => abstract_backend.py} (100%) rename marznode/backends/hysteria2/{interface.py => hysteria2_backend.py} (98%) rename marznode/backends/xray/{interface.py => xray_backend.py} (98%) diff --git a/marznode/backends/base.py b/marznode/backends/abstract_backend.py similarity index 100% rename from marznode/backends/base.py rename to marznode/backends/abstract_backend.py diff --git a/marznode/backends/hysteria2/interface.py b/marznode/backends/hysteria2/hysteria2_backend.py similarity index 98% rename from marznode/backends/hysteria2/interface.py rename to marznode/backends/hysteria2/hysteria2_backend.py index 59c2f6d..86f2dfe 100644 --- a/marznode/backends/hysteria2/interface.py +++ b/marznode/backends/hysteria2/hysteria2_backend.py @@ -7,7 +7,7 @@ import aiohttp from aiohttp import web, ClientConnectorError -from marznode.backends.base import VPNBackend +from marznode.backends.abstract_backend import VPNBackend from marznode.backends.hysteria2._config import HysteriaConfig from marznode.backends.hysteria2._runner import Hysteria from marznode.models import User, Inbound diff --git a/marznode/backends/xray/interface.py b/marznode/backends/xray/xray_backend.py similarity index 98% rename from marznode/backends/xray/interface.py rename to marznode/backends/xray/xray_backend.py index 5877999..760acb4 100644 --- a/marznode/backends/xray/interface.py +++ b/marznode/backends/xray/xray_backend.py @@ -5,7 +5,7 @@ import logging from collections import defaultdict -from marznode.backends.base import VPNBackend +from marznode.backends.abstract_backend import VPNBackend from marznode.backends.xray._config import XrayConfig from marznode.backends.xray._runner import XrayCore from marznode.backends.xray.api import XrayAPI diff --git a/marznode/marznode.py b/marznode/marznode.py index ef18295..1b0ffea 100644 --- a/marznode/marznode.py +++ b/marznode/marznode.py @@ -9,8 +9,8 @@ from grpclib.utils import graceful_exit from marznode import config -from marznode.backends.hysteria2.interface import HysteriaBackend -from marznode.backends.xray.interface import XrayBackend +from marznode.backends.hysteria2.hysteria2_backend import HysteriaBackend +from marznode.backends.xray.xray_backend import XrayBackend from marznode.config import ( HYSTERIA_EXECUTABLE_PATH, HYSTERIA_CONFIG_PATH, diff --git a/marznode/service/service.py b/marznode/service/service.py index 5fa41fd..f5b3484 100644 --- a/marznode/service/service.py +++ b/marznode/service/service.py @@ -10,7 +10,7 @@ from grpclib import GRPCError, Status from grpclib.server import Stream -from marznode.backends.base import VPNBackend +from marznode.backends.abstract_backend import VPNBackend from marznode.storage import BaseStorage from .service_grpc import MarzServiceBase from .service_pb2 import (