From bff1ec3635410ddcc6c8776029a1e53d28b2df76 Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 1 Nov 2017 19:38:46 +0100 Subject: [PATCH] Issue #131: rename addFromMultiaddrs to setFromMultiaddrs License: MIT Signed-off-by: Hector Sanjuan --- cluster.go | 6 +++--- peer_manager.go | 4 ++-- rpc_api.go | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cluster.go b/cluster.go index 3ab69be2..be4818e9 100644 --- a/cluster.go +++ b/cluster.go @@ -145,9 +145,9 @@ func (c *Cluster) setupPeerManager() { c.peerManager = pm if len(c.config.Peers) > 0 { - c.peerManager.addFromMultiaddrs(c.config.Peers, false) + c.peerManager.setFromMultiaddrs(c.config.Peers, false) } else { - c.peerManager.addFromMultiaddrs(c.config.Bootstrap, false) + c.peerManager.setFromMultiaddrs(c.config.Bootstrap, false) } } @@ -588,7 +588,7 @@ func (c *Cluster) PeerAdd(addr ma.Multiaddr) (api.ID, error) { addrSerial.ToMultiaddr()) err = c.rpcClient.Call(pid, "Cluster", - "PeerManagerAddFromMultiaddrs", + "PeerManagerSetFromMultiaddrs", api.MultiaddrsToSerial(clusterPeers), &struct{}{}) if err != nil { diff --git a/peer_manager.go b/peer_manager.go index 7c588dc5..3b6a082e 100644 --- a/peer_manager.go +++ b/peer_manager.go @@ -153,11 +153,11 @@ func (pm *peerManager) peersAddrs() []ma.Multiaddr { } // func (pm *peerManager) addFromConfig(cfg *Config) error { -// return pm.addFromMultiaddrs(cfg.ClusterPeers) +// return pm.setFromMultiaddrs(cfg.ClusterPeers) // } // this resets peers! -func (pm *peerManager) addFromMultiaddrs(addrs []ma.Multiaddr, save bool) error { +func (pm *peerManager) setFromMultiaddrs(addrs []ma.Multiaddr, save bool) error { pm.resetPeers() for _, m := range addrs { err := pm.addPeer(m, false) diff --git a/rpc_api.go b/rpc_api.go index 79d4d235..9ba22ad0 100644 --- a/rpc_api.go +++ b/rpc_api.go @@ -294,10 +294,10 @@ func (rpcapi *RPCAPI) PeerManagerAddPeer(in api.MultiaddrSerial, out *struct{}) return err } -// PeerManagerAddFromMultiaddrs runs peerManager.addFromMultiaddrs(). -func (rpcapi *RPCAPI) PeerManagerAddFromMultiaddrs(in api.MultiaddrsSerial, out *struct{}) error { +// PeerManagerSetFromMultiaddrs runs peerManager.setFromMultiaddrs(). +func (rpcapi *RPCAPI) PeerManagerSetFromMultiaddrs(in api.MultiaddrsSerial, out *struct{}) error { addrs := in.ToMultiaddrs() - err := rpcapi.c.peerManager.addFromMultiaddrs(addrs, true) + err := rpcapi.c.peerManager.setFromMultiaddrs(addrs, true) return err }