remove the rest of the supernode code
missed in the initial cleanup License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Oct 14, 2017 at 16:43 UTC
a0bedf6a5b56642b977a70cfb6433e79a5077cc4
4 files changed
+11
-49
docs/config.md
-4
@@ -16,7 +16,6 @@ on a running daemon do not read the config file at runtime.
16
- [`Ipns`](#ipns)
17
- [`Mounts`](#mounts)
18
- [`Reprovider`](#reprovider)
19
-- [`SupernodeRouting`](#supernoderouting)
19
- [`Swarm`](#swarm)
20
21
## `Addresses`
@@ -242,9 +241,6 @@ Tells reprovider what should be announced. Valid strategies are:
241
- "pinned" - only announce pinned data
242
- "roots" - only announce directly pinned keys and root keys of recursive pins
243
245
-## `SupernodeRouting`
246
-Deprecated.
247
-
244
## `Swarm`
245
Options for configuring the swarm.
246
misc/completion/ipfs-completion.bash
+1
-1
@@ -159,7 +159,7 @@ _ipfs_config_show()
159
_ipfs_daemon()
160
{
161
if [[ ${prev} == "--routing" ]] ; then
162
- _ipfs_comp "dht supernode" # TODO: Solve autocomplete bug for "="
162
+ _ipfs_comp "dht dhtclient none" # TODO: Solve autocomplete bug for "="
163
elif [[ ${prev} == "--mount-ipfs" ]] || [[ ${prev} == "--mount-ipns" ]] || [[ ${prev} == "=" ]]; then
164
_ipfs_filesystem_complete
165
elif [[ ${word} == -* ]] ; then
repo/config/config.go
+10
-11
@@ -14,17 +14,16 @@ import (
14
15
// Config is used to load ipfs config files.
16
type Config struct {
17
- Identity Identity // local node's peer identity
18
- Datastore Datastore // local node's storage
19
- Addresses Addresses // local node's addresses
20
- Mounts Mounts // local node's mount points
21
- Discovery Discovery // local node's discovery mechanisms
22
- Ipns Ipns // Ipns settings
23
- Bootstrap []string // local nodes's bootstrap peer addresses
24
- Gateway Gateway // local node's gateway server options
25
- SupernodeRouting SupernodeClientConfig // local node's routing servers (if SupernodeRouting enabled)
26
- API API // local node's API settings
27
- Swarm SwarmConfig
17
+ Identity Identity // local node's peer identity
18
+ Datastore Datastore // local node's storage
19
+ Addresses Addresses // local node's addresses
20
+ Mounts Mounts // local node's mount points
21
+ Discovery Discovery // local node's discovery mechanisms
22
+ Ipns Ipns // Ipns settings
23
+ Bootstrap []string // local nodes's bootstrap peer addresses
24
+ Gateway Gateway // local node's gateway server options
25
+ API API // local node's API settings
26
+ Swarm SwarmConfig
27
28
Reprovider Reprovider
29
Experimental Experiments
repo/config/supernode.go
deleted
-33
@@ -1,33 +0,0 @@
1
-package config
2
-
3
-import "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
4
-
5
-// TODO replace with final servers before merge
6
-
7
-// TODO rename
8
-type SupernodeClientConfig struct {
9
- Servers []string
10
-}
11
-
12
-var DefaultSNRServers = []string{
13
- "/ip4/104.236.176.52/tcp/4002/ipfs/QmXdb7tWTxdFEQEFgWBqkuYSrZd3mXrC7HxkD4krGNYx2U",
14
- "/ip4/104.236.179.241/tcp/4002/ipfs/QmVRqViDByUxjUMoPnjurjKvZhaEMFDtK35FJXHAM4Lkj6",
15
- "/ip4/104.236.151.122/tcp/4002/ipfs/QmSZwGx8Tn8tmcM4PtDJaMeUQNRhNFdBLVGPzRiNaRJtFH",
16
- "/ip4/162.243.248.213/tcp/4002/ipfs/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP",
17
- "/ip4/128.199.219.111/tcp/4002/ipfs/Qmb3brdCYmKG1ycwqCbo6LUwWxTuo3FisnJV2yir7oN92R",
18
- "/ip4/104.236.76.40/tcp/4002/ipfs/QmdRBCV8Cz2dGhoKLkD3YjPwVFECmqADQkx5ZteF2c6Fy4",
19
- "/ip4/178.62.158.247/tcp/4002/ipfs/QmUdiMPci7YoEUBkyFZAh2pAbjqcPr7LezyiPD2artLw3v",
20
- "/ip4/178.62.61.185/tcp/4002/ipfs/QmVw6fGNqBixZE4bewRLT2VXX7fAHUHs8JyidDiJ1P7RUN",
21
-}
22
-
23
-func (gcr *SupernodeClientConfig) ServerIPFSAddrs() ([]ipfsaddr.IPFSAddr, error) {
24
- var addrs []ipfsaddr.IPFSAddr
25
- for _, server := range gcr.Servers {
26
- addr, err := ipfsaddr.ParseString(server)
27
- if err != nil {
28
- return nil, err
29
- }
30
- addrs = append(addrs, addr)
31
- }
32
- return addrs, nil
33
-}