cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Issue #131: rename addFromMultiaddrs to setFromMultiaddrs

Browse Source 
License: MIT
Signed-off-by: Hector Sanjuan <hector@protocol.ai>
This commit is contained in:
Hector Sanjuan 2017-11-01 19:38:46 +01:00
parent f64d3edb91
commit bff1ec3635
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster.go
View File

@ -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 {

4
peer_manager.go
View File

@ -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)

6
rpc_api.go
View File

@ -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
}