ITestID not string

itests/clusterdb_test.go

@@ -18,7 +18,6 @@ func withSetup(t *testing.T, f func(*kit.TestMiner)) {
 		kit.MockProofs(),
 	)
 
-	defer miner.BaseAPI.(*impl.StorageMinerAPI).ClusterDB.ITestDeleteAll()
 	f(miner)
 }
 

itests/kit/ensemble.go

@@ -55,6 +55,7 @@ import (
 	lotusminer "github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node"
 	"github.com/filecoin-project/lotus/node/config"
+	"github.com/filecoin-project/lotus/node/impl"
 	"github.com/filecoin-project/lotus/node/modules"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	testing2 "github.com/filecoin-project/lotus/node/modules/testing"
@@ -773,6 +774,9 @@ func (n *Ensemble) Start() *Ensemble {
 		require.NoError(n.t, err)
 
 		n.t.Cleanup(func() { _ = stop(context.Background()) })
+		n.t.Cleanup(func() {
+			m.StorageMiner.(*impl.StorageMinerAPI).ClusterDB.ITestDeleteAll()
+		})
 
 		m.BaseAPI = m.StorageMiner
 

node/builder_miner.go

@@ -233,7 +233,7 @@ func ConfigStorageMiner(c interface{}) Option {
 		Override(new(config.ProvingConfig), cfg.Proving),
 		Override(new(*ctladdr.AddressSelector), modules.AddressSelector(&cfg.Addresses)),
 		Override(new(*clusterdb.DB), clusterdb.NewFromConfigWithITestID(cfg.ClusterDB)),
-		Override(new(clusterdb.ITestID), ""),
+		Override(new(clusterdb.ITestID), clusterdb.ITestID("")),
 	)
 }