mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "p2p --link now defaults to setting up a bi-directional link"

Browse source 
This reverts commit 3037feb1bf.

On second thought, this was an overcomplication of what should be the
lowest-level primitive. Let's build bi-directional links at the pairing
level with eg magic wormhole.
This commit is contained in:
Joey Hess 2016-12-16 18:26:07 -04:00
parent 5779e31cc7
commit 38f9337e16
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
7 changed files with 56 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

5
P2P/Address.hs
View file

@ -14,7 +14,6 @@ import Git.Types
import Creds
import Utility.AuthToken
import Utility.Tor
import qualified Utility.SimpleProtocol as Proto
import qualified Data.Text as T
@ -47,10 +46,6 @@ instance FormatP2PAddress P2PAddress where
return (TorAnnex (OnionAddress onionaddr) onionport)
| otherwise = Nothing
instance Proto.Serializable P2PAddressAuth where
serialize = formatP2PAddress
deserialize = unformatP2PAddress
torAnnexScheme :: String
torAnnexScheme = "tor-annex:"