allow ffsusemasteraddr with devnet (textileio#567)

asutula · web-flow · commit f5ba897ee13e · 2020-08-13T17:11:29.000-05:00
Signed-off-by: Aaron Sutula &lt;hi@asutula.com&gt;
diff --git a/api/server/server.go b/api/server/server.go
@@ -119,7 +119,7 @@ type Config struct {
 
 // NewServer starts and returns a new server with the given configuration.
 func NewServer(conf Config) (*Server, error) {
-	if conf.FFSUseMasterAddr && !(len(conf.LotusMasterAddr) > 0 || conf.AutocreateMasterAddr) {
+	if conf.FFSUseMasterAddr && !conf.Devnet && !(len(conf.LotusMasterAddr) > 0 || conf.AutocreateMasterAddr) {
 		return nil, fmt.Errorf("FFSUseMasterAddr requires LotusMasterAddr or AutocreateMasterAddr to be provided")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ type Config struct {`
`119`	`119`
`120`	`120`	`// NewServer starts and returns a new server with the given configuration.`
`121`	`121`	`func NewServer(conf Config) (*Server, error) {`
`122`		`- if conf.FFSUseMasterAddr && !(len(conf.LotusMasterAddr) > 0 \|\| conf.AutocreateMasterAddr) {`
	`122`	`+ if conf.FFSUseMasterAddr && !conf.Devnet && !(len(conf.LotusMasterAddr) > 0 \|\| conf.AutocreateMasterAddr) {`
`123`	`123`	`return nil, fmt.Errorf("FFSUseMasterAddr requires LotusMasterAddr or AutocreateMasterAddr to be provided")`
`124`	`124`	`}`
`125`	`125`