From 65346101a2c1b0c05172b1ac4985c100cfa8ac90 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Sun, 3 May 2026 16:32:26 +0200 Subject: [PATCH] libstore: rename openConnectionWrapper to something more meaningful Change-Id: I46c57476ef73c6a8b851ab34ba67872c8f6b826b --- lix/libstore/remote-store.cc | 3 +-- lix/libstore/remote-store.hh | 2 +- lix/nix/daemon.cc | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lix/libstore/remote-store.cc b/lix/libstore/remote-store.cc index 9783bbf3f..3c333b460 100644 --- a/lix/libstore/remote-store.cc +++ b/lix/libstore/remote-store.cc @@ -54,8 +54,7 @@ RemoteStore::RemoteStore(const RemoteStoreConfig & config) { } - -kj::Promise>> RemoteStore::openConnectionWrapper() +kj::Promise>> RemoteStore::openConnectionForDaemonForwarding() { return openConnection(); } diff --git a/lix/libstore/remote-store.hh b/lix/libstore/remote-store.hh index 367f05145..84f8157ec 100644 --- a/lix/libstore/remote-store.hh +++ b/lix/libstore/remote-store.hh @@ -178,7 +178,7 @@ public: struct Connection; - kj::Promise>> openConnectionWrapper(); + kj::Promise>> openConnectionForDaemonForwarding(); protected: diff --git a/lix/nix/daemon.cc b/lix/nix/daemon.cc index 08b5d312a..b9e2cc2c5 100644 --- a/lix/nix/daemon.cc +++ b/lix/nix/daemon.cc @@ -531,7 +531,7 @@ daemonInstance(AsyncIoRoot & aio, std::optional forceTrustClientOpt */ static void forwardStdioConnection(AsyncIoRoot & aio, RemoteStore & store) { - auto conn = aio.blockOn(store.openConnectionWrapper()); + auto conn = aio.blockOn(store.openConnectionForDaemonForwarding()); auto connSocket = AIO().lowLevelProvider.wrapSocketFd(conn->getFD()); auto asyncStdin = AIO().lowLevelProvider.wrapInputFd(STDIN_FILENO); auto asyncStdout = AIO().lowLevelProvider.wrapOutputFd(STDOUT_FILENO);