refix the conflict resolution

Cog-Creators · Mar 20, 2022 · ab6726b · ab6726b
1 parent 70bbca3
commit ab6726b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/lavalink/node.py b/lavalink/node.py
@@ -11,17 +11,10 @@
 from discord.backoff import ExponentialBackoff
 from discord.ext.commands import Bot
 
-from . import __version__, ws_discord_log, ws_ll_log, log, ws_rll_log
-from .enums import (
-    LavalinkIncomingOp,
-    NodeState,
-    LavalinkEvents,
-    LavalinkOutgoingOp,
-    DiscordVoiceSocketResponses,
-)
+from . import log, ws_ll_log, ws_rll_log, __version__
+from .enums import LavalinkEvents, LavalinkIncomingOp, LavalinkOutgoingOp, NodeState, PlayerState
 from .player import Player
-from .rest_api import RESTClient, Track
-from .errors import AbortingNodeConnection, NodeNotReady, NodeNotFound
+from .rest_api import Track
 from .utils import VoiceChannel
 from .errors import AbortingNodeConnection, NodeNotReady, NodeNotFound, PlayerNotFound
 

diff --git a/tests/test_lavalink.py b/tests/test_lavalink.py
@@ -9,7 +9,6 @@
 async def test_initialize(bot):
     await lavalink.initialize(bot, "localhost", "password", 2333, 2333)
 
-    assert lavalink.player_manager.user_id == bot.user.id
     assert len(lavalink.node._nodes) == bot.shard_count
 
     bot.add_listener.assert_called()