aboutsummaryrefslogtreecommitdiff
path: root/P2P/Address.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-12-16 18:26:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-12-16 18:26:07 -0400
commit82bb3565a3b4ae4442d006b06c1bd487cba783a8 (patch)
tree6d7681bed722e263a67770852930bdd1754e07b5 /P2P/Address.hs
parent097c82b17ed0f3c96d1ca1617f42c39650dc9ab2 (diff)
Revert "p2p --link now defaults to setting up a bi-directional link"
This reverts commit 6aa7e136b5d246228723f4c9996bda11f66c4445. 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.
Diffstat (limited to 'P2P/Address.hs')
-rw-r--r--P2P/Address.hs5
1 files changed, 0 insertions, 5 deletions
diff --git a/P2P/Address.hs b/P2P/Address.hs
index 919739327..1b1f66059 100644
--- a/P2P/Address.hs
+++ b/P2P/Address.hs
@@ -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:"