diff --git a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs index d31c3fa4..adb2382c 100644 --- a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs +++ b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/App.hs @@ -141,6 +141,7 @@ runGitCLI o m = do let endpoints = [ Endpoint @UNIX peerAPI , Endpoint @UNIX refLogAPI + , Endpoint @UNIX lwwAPI , Endpoint @UNIX storageAPI ] diff --git a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs index 8a20ef20..f61360af 100644 --- a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs +++ b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/Import.hs @@ -74,8 +74,6 @@ importRepoWait lwwKey = do subscribeLWWRef lwwKey - -- void $ try @_ @SomeException (getRefLogMerkl puk) - fetchLWWRef lwwKey flip fix (IWaitLWWBlock 20) $ \next -> \case @@ -84,9 +82,7 @@ importRepoWait lwwKey = do throwIO ImportRefLogNotFound IWaitLWWBlock w -> do - fetchLWWRef lwwKey onProgress ip (ImportWaitLWW w lwwKey) - notice $ yellow ("fetchLWWRef" <+> pretty lwwKey) lww <- readLWWBlock sto lwwKey case lww of diff --git a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/RefLog.hs b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/RefLog.hs index 9ccfe1fc..912543d6 100644 --- a/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/RefLog.hs +++ b/hbs21-git/hbs2-git-client-lib/HBS2/Git/Client/RefLog.hs @@ -29,10 +29,7 @@ subscribeLWWRef puk = do fetchLWWRef :: (GitPerks m, MonadReader GitEnv m) => LWWRefKey HBS2Basic -> m () fetchLWWRef key = do api <- asks _lwwRefAPI - notice $ green "fetchLWWRef" <+> pretty key - r <- race (pause @'Seconds 2) (callService @RpcLWWRefFetch api key) - warn $ "result:" <+> viaShow r - + void $ race (pause @'Seconds 1) (callService @RpcLWWRefFetch api key) getRefLogMerkle :: (GitPerks m, MonadReader GitEnv m) => RefLogId -> m (Maybe HashRef) getRefLogMerkle puk = do diff --git a/nix/peer/flake.lock b/nix/peer/flake.lock index 256a106f..81cca12e 100644 --- a/nix/peer/flake.lock +++ b/nix/peer/flake.lock @@ -295,11 +295,11 @@ "suckless-conf": "suckless-conf_2" }, "locked": { - "lastModified": 1710493310, - "narHash": "sha256-LeTP5qZvjl4ZY23ktv6mYNuTRKsJenuEajw3Cz8vP70=", + "lastModified": 1710494072, + "narHash": "sha256-6pZlN9lLxWBzWQXJe34G6UgNjla1FKEAs+fOL9R+vg8=", "ref": "lwwrepo", - "rev": "9497207115ed51663415c9e066a86bcb615a3cf8", - "revCount": 982, + "rev": "f7578a4a8ceb521ce038be257b4628fa2d811ce1", + "revCount": 983, "type": "git", "url": "http://git.hbs2/BTThPdHKF8XnEq4m6wzbKHKA6geLFK4ydYhBXAqBdHSP" },