use custom localnet storage config (textileio#588)

jsign · web-flow · commit 7fa2b365ea6d · 2020-09-10T15:53:50.000-03:00
- Use a custom StorageConfig if running in Localnet.
diff --git a/api/server/server.go b/api/server/server.go
@@ -229,7 +229,7 @@ func NewServer(conf Config) (*Server, error) {
 		return nil, fmt.Errorf("creating scheduler: %s", err)
 	}
 
-	ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, pm, dm, sched, conf.FFSUseMasterAddr)
+	ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, pm, dm, sched, conf.FFSUseMasterAddr, conf.Devnet)
 	if err != nil {
 		return nil, fmt.Errorf("creating ffs instance: %s", err)
 	}
diff --git a/ffs/integrationtest/integrationtest.go b/ffs/integrationtest/integrationtest.go
@@ -145,7 +145,7 @@ func NewFFSManager(t require.TestingT, ds datastore.TxnDatastore, clientBuilder
 
 	pm := paych.New(clientBuilder)
 
-	manager, err := manager.New(ds, wm, pm, dm, sched, false)
+	manager, err := manager.New(ds, wm, pm, dm, sched, false, true)
 	require.NoError(t, err)
 	err = manager.SetDefaultStorageConfig(ffs.StorageConfig{
 		Hot: ffs.HotConfig{
diff --git a/ffs/manager/manager.go b/ffs/manager/manager.go
@@ -45,6 +45,22 @@ var (
 			},
 		},
 	}
+
+	localnetZeroConfig = ffs.StorageConfig{
+		Hot: ffs.HotConfig{
+			Enabled: true,
+			Ipfs: ffs.IpfsConfig{
+				AddTimeout: 30,
+			},
+		},
+		Cold: ffs.ColdConfig{
+			Enabled: true,
+			Filecoin: ffs.FilConfig{
+				RepFactor:       1,
+				DealMinDuration: util.MinDealDuration,
+			},
+		},
+	}
 	dsDefaultStorageConfigKey = datastore.NewKey("defaultstorageconfig")
 )
 
@@ -66,11 +82,11 @@ type Manager struct {
 }
 
 // New returns a new Manager.
-func New(ds datastore.Datastore, wm ffs.WalletManager, pm ffs.PaychManager, drm ffs.DealRecordsManager, sched *scheduler.Scheduler, ffsUseMasterAddr bool) (*Manager, error) {
+func New(ds datastore.Datastore, wm ffs.WalletManager, pm ffs.PaychManager, drm ffs.DealRecordsManager, sched *scheduler.Scheduler, ffsUseMasterAddr bool, onLocalnet bool) (*Manager, error) {
 	if ffsUseMasterAddr && wm.MasterAddr() == address.Undef {
 		return nil, fmt.Errorf("ffsUseMasterAddr requires that master address is defined")
 	}
-	storageConfig, err := loadDefaultStorageConfig(ds)
+	storageConfig, err := loadDefaultStorageConfig(ds, onLocalnet)
 	if err != nil {
 		return nil, fmt.Errorf("loading default storage config: %s", err)
 	}
@@ -229,9 +245,12 @@ func (m *Manager) saveDefaultConfig(dc ffs.StorageConfig) error {
 	return nil
 }
 
-func loadDefaultStorageConfig(ds datastore.Datastore) (ffs.StorageConfig, error) {
+func loadDefaultStorageConfig(ds datastore.Datastore, onLocalnet bool) (ffs.StorageConfig, error) {
 	d, err := ds.Get(dsDefaultStorageConfigKey)
 	if err == datastore.ErrNotFound {
+		if onLocalnet {
+			return localnetZeroConfig, nil
+		}
 		return zeroConfig, nil
 	}
 	if err != nil {
diff --git a/ffs/manager/manager_test.go b/ffs/manager/manager_test.go
@@ -164,14 +164,14 @@ func TestDefaultStorageConfig(t *testing.T) {
 	t.Parallel()
 	ds := tests.NewTxMapDatastore()
 	client, addr, _ := tests.CreateLocalDevnet(t, 1)
-	m, cls, err := newManager(client, ds, addr, false)
+	m, cls, err := newManager(client, ds, addr, true)
 	require.NoError(t, err)
 	defer require.NoError(t, cls())
 
 	// A newly created manager must have
 	// the zeroConfig defined value.
 	c := m.GetDefaultStorageConfig()
-	require.Equal(t, zeroConfig, c)
+	require.Equal(t, localnetZeroConfig, c)
 
 	// Change the default config and test.
 	c.Hot.Enabled = false
@@ -202,7 +202,7 @@ func newManager(clientBuilder lotus.ClientBuilder, ds datastore.TxnDatastore, ma
 	if err != nil {
 		return nil, func() error { return nil }, err
 	}
-	m, err := New(ds, wm, pm, dm, nil, ffsUseMasterAddr)
+	m, err := New(ds, wm, pm, dm, nil, ffsUseMasterAddr, true)
 	if err != nil {
 		return nil, func() error { return nil }, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ func NewServer(conf Config) (*Server, error) {`
`229`	`229`	`return nil, fmt.Errorf("creating scheduler: %s", err)`
`230`	`230`	`}`
`231`	`231`
`232`		`- ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, pm, dm, sched, conf.FFSUseMasterAddr)`
	`232`	`+ ffsManager, err := manager.New(txndstr.Wrap(ds, "ffs/manager"), wm, pm, dm, sched, conf.FFSUseMasterAddr, conf.Devnet)`
`233`	`233`	`if err != nil {`
`234`	`234`	`return nil, fmt.Errorf("creating ffs instance: %s", err)`
`235`	`235`	`}`