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

Fix: ipfsproxy: fix test failing with empty multiaddresses

Browse Source 
This is a recent change in the multiaddress library to disallow
empty addresses.
This commit is contained in:
Hector Sanjuan 2019-05-23 18:58:47 +02:00
parent 196aa23f34
commit 99be078548
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
api/ipfsproxy/config.go
View File

@ -206,20 +206,23 @@ func (cfg *Config) LoadJSON(raw []byte) error {
} }
func (cfg *Config) applyJSONConfig(jcfg *jsonConfig) error { func (cfg *Config) applyJSONConfig(jcfg *jsonConfig) error {
proxyAddr, err := ma.NewMultiaddr(jcfg.ListenMultiaddress) if jcfg.ListenMultiaddress != "" {
if err != nil { proxyAddr, err := ma.NewMultiaddr(jcfg.ListenMultiaddress)
return fmt.Errorf("error parsing proxy listen_multiaddress: %s", err) if err != nil {
return fmt.Errorf("error parsing proxy listen_multiaddress: %s", err)
}
cfg.ListenAddr = proxyAddr
} }
nodeAddr, err := ma.NewMultiaddr(jcfg.NodeMultiaddress) if jcfg.NodeMultiaddress != "" {
if err != nil { nodeAddr, err := ma.NewMultiaddr(jcfg.NodeMultiaddress)
return fmt.Errorf("error parsing ipfs node_multiaddress: %s", err) if err != nil {
return fmt.Errorf("error parsing ipfs node_multiaddress: %s", err)
}
cfg.NodeAddr = nodeAddr
} }
cfg.ListenAddr = proxyAddr
cfg.NodeAddr = nodeAddr
config.SetIfNotDefault(jcfg.NodeHTTPS, &cfg.NodeHTTPS) config.SetIfNotDefault(jcfg.NodeHTTPS, &cfg.NodeHTTPS)
err = config.ParseDurations( err := config.ParseDurations(
"ipfsproxy", "ipfsproxy",
&config.DurationOpt{Duration: jcfg.ReadTimeout, Dst: &cfg.ReadTimeout, Name: "read_timeout"}, &config.DurationOpt{Duration: jcfg.ReadTimeout, Dst: &cfg.ReadTimeout, Name: "read_timeout"},
&config.DurationOpt{Duration: jcfg.ReadHeaderTimeout, Dst: &cfg.ReadHeaderTimeout, Name: "read_header_timeout"}, &config.DurationOpt{Duration: jcfg.ReadHeaderTimeout, Dst: &cfg.ReadHeaderTimeout, Name: "read_header_timeout"},