fix(dsfs): fix adjustments to meta prior to commit message generation

bad copy-paste meant that "next" meta object wasn't being examined for "path" or "qri"
keys

api/datasets_test.go

@@ -429,8 +429,6 @@ func TestGetZip(t *testing.T) {
  t.Fatalf("expected status code 200, got %d", gotStatusCode)
  }
 
- // ioutil.WriteFile("testdata/cities/exported_2.zip", []byte(gotBodyString), 0644)
-
  // Compare the API response to the expected zip file
  expectBytes, err := ioutil.ReadFile("testdata/cities/exported.zip")
  if err != nil {
@@ -467,12 +465,8 @@ func TestDatasetGet(t *testing.T) {
 
  actualStatusCode, actualBody := APICall("/get/peer/test_ds", dsHandler.GetHandler)
  assertStatusCode(t, "get dataset", actualStatusCode, 200)
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestGetDataset.test_ds.json")
  got := datasetJSONResponse(t, actualBody)
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("output mismatch (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestGetDataset.test_ds.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestDatasetGet.test_ds.json", got)
 
  // Get csv body using "body.csv" suffix
  actualStatusCode, actualBody = APICall("/get/peer/test_ds/body.csv", dsHandler.GetHandler)

base/dsfs/body_test.go

@@ -4,10 +4,7 @@ import (
  "bytes"
  "context"
  "io/ioutil"
- "os"
  "testing"
-
- "github.com/qri-io/qfs"
 )
 
 func TestLoadBody(t *testing.T) {
@@ -17,10 +14,6 @@ func TestLoadBody(t *testing.T) {
  t.Fatalf("error creating test filestore: %s", err.Error())
  }
 
- t.Logf("%v", datasets)
- v, _ := fs.(*qfs.MemFS).Print()
- ioutil.WriteFile("/Users/b5/Desktop/memfs_contents", []byte(v), os.ModePerm)
-
  ds, err := LoadDataset(ctx, fs, datasets["cities"])
  if err != nil {
  t.Fatalf("error loading dataset: %s", err.Error())

base/dsfs/commit.go

@@ -32,7 +32,8 @@ const (
  BodyDefault = BodyAction("default")
  // BodySame means that the bodies are the same, no need to compare
  BodySame = BodyAction("same")
- // BodyTooBig means the body is too big to compare, and should be assumed to have changed
+ // BodyTooBig means the body is too big to directly compare, and should use
+ // some other method
  BodyTooBig = BodyAction("too_big")
 )
 
@@ -261,11 +262,13 @@ func generateCommitDescriptions(ctx context.Context, fs qfs.Filesystem, ds, prev
  if prevMeta, ok := prevData["meta"]; ok {
  if prevObject, ok := prevMeta.(map[string]interface{}); ok {
  delete(prevObject, "path")
+ delete(prevObject, "qri")
  }
  }
- if nextMeta, ok := prevData["meta"]; ok {
+ if nextMeta, ok := nextData["meta"]; ok {
  if nextObject, ok := nextMeta.(map[string]interface{}); ok {
  delete(nextObject, "path")
+ delete(nextObject, "qri")
  }
  }
 

base/dsfs/compute_fields.go

@@ -151,7 +151,6 @@ func (cff *computeFieldsFile) StatsComponent() (*dataset.Stats, error) {
  }, nil
 }
 
-// , store cafs.Filestore, ds, prev *dataset.Dataset, bodyR io.Reader, pk crypto.PrivKey, sw SaveSwitches, done chan error
 func (cff *computeFieldsFile) handleRows(ctx context.Context) {
  var (
  batchBuf *dsio.EntryBuffer

base/dsfs/dataset.go

@@ -141,7 +141,8 @@ func CreateDataset(
  ctx context.Context,
  source qfs.Filesystem,
  destination qfs.Filesystem,
- ds, prev *dataset.Dataset,
+ ds *dataset.Dataset,
+ prev *dataset.Dataset,
  pk crypto.PrivKey,
  sw SaveSwitches,
 ) (string, error) {

base/dsfs/dataset_test.go

@@ -432,7 +432,7 @@ func TestWriteDataset(t *testing.T) {
 
  if ref.Transform != nil {
  if ref.Transform.IsEmpty() {
- t.Errorf("expected stored dataset.Transform to populated")
+ t.Errorf("expected stored dataset.Transform to be populated")
  }
  ds.Transform.Assign(dataset.NewTransformRef(ref.Transform.Path))
  }
@@ -1047,41 +1047,3 @@ func BenchmarkValidateJSON(b *testing.B) {
  })
  }
 }
-
-// func BenchmarkPrepareDataset1000000Rows(b *testing.B) {
-// ctx := context.Background()
-// _, ds := GenerateDataset(b, 1000000, "csv")
-// fs := qfs.NewMemFS()
-// info := testPeers.GetTestPeerInfo(10)
-// privKey := info.PrivKey
-
-// for i := 0; i < b.N; i++ {
-// f, err := ioutil.TempFile("", "benchmark_prepare_dataset")
-// if err != nil {
-// b.Fatal(err)
-// }
-
-// prepareDataset(ctx, fs, ds, nil, privKey, f, SaveSwitches{})
-
-// os.RemoveAll(f.Name())
-// }
-// }
-
-// func BenchmarkPrepareDataset5000000Rows(b *testing.B) {
-// ctx := context.Background()
-// _, ds := GenerateDataset(b, 5000000, "csv")
-// fs := qfs.NewMemFS()
-// info := testPeers.GetTestPeerInfo(10)
-// privKey := info.PrivKey
-
-// for i := 0; i < b.N; i++ {
-// f, err := ioutil.TempFile("", "benchmark_prepare_dataset")
-// if err != nil {
-// b.Fatal(err)
-// }
-
-// prepareDataset(ctx, fs, ds, nil, privKey, f, SaveSwitches{})
-
-// os.RemoveAll(f.Name())
-// }
-// }

base/dsfs/doc.go

@@ -6,8 +6,3 @@ import (
 )
 
 var log = logger.Logger("dsfs")
-
-func init() {
- // logger.SetLogLevel("dsfs", "debug")
- // logger.SetLogLevel("qfs", "debug")
-}

base/remove.go

@@ -103,10 +103,6 @@ func RemoveNVersionsFromStore(ctx context.Context, r repo.Repo, curr dsref.Ref,
  // Decrement our counter. If counter was -1, this loop will continue forever, until a
  // blank PreviousPath is found.
  i--
- // unpin dataset, ignoring "not pinned" errors
- // if err = UnpinDataset(ctx, r, dest.Path); err != nil && !strings.Contains(err.Error(), "not pinned") {
- // return nil, err
- // }
 
  if err = r.Filesystem().Delete(ctx, dest.Path); err != nil {
  return nil, err

cmd/cmd_test.go

@@ -223,11 +223,7 @@ func TestSaveThenOverrideMetaComponent(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This dataset is ds_ten.yaml, with the meta replaced by meta_override.yaml.
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveThenOverrideMetaComponent.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveThenOverrideMetaComponent.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveThenOverrideMetaComponent.json", got)
 }
 
 // Test save with a body, then adding a meta
@@ -248,11 +244,7 @@ func TestSaveWithBodyThenAddMetaComponent(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This version has a commit message about the meta being added
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveWithBodyThenAddMetaComponent.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveWithBodyThenAddMetaComponent.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveWithBodyThenAddMetaComponent.json", got)
 }
 
 // Test save with a body, then adding a meta
@@ -273,11 +265,7 @@ func TestSaveWithBodyThenAddMetaAndSmallBodyChange(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This version has a commit message about the meta being added and body changing
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveWithBodyThenAddMetaAndSmallBodyChange.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveWithBodyThenAddMetaAndSmallBodyChange.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveWithBodyThenAddMetaAndSmallBodyChange.json", got)
 }
 
 // Test that saving with two components at once will merge them together.
@@ -299,11 +287,7 @@ func TestSaveTwoComponents(t *testing.T) {
 
  // This dataset is ds_ten.yaml, with the meta replaced by meta_override ("different title") and
  // the structure replaced by structure_override (lazyQuotes: false && title: "name").
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveTwoComponents.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveTwoComponents.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveTwoComponents.json", got)
 }
 
 // Test that save can override just the transform
@@ -324,11 +308,7 @@ func TestSaveThenOverrideTransform(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This dataset is ds_ten.yaml, with an added transform section
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveThenOverrideTransform.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveThenOverrideTransform.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveThenOverrideTransform.json", got)
 }
 
 // Test that save can override just the viz
@@ -349,11 +329,7 @@ func TestSaveThenOverrideViz(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This dataset is ds_ten.yaml, with an added viz section
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveThenOverrideViz.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveThenOverrideViz.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveThenOverrideViz.json", got)
 }
 
 // Test that save can combine a meta compoent, and a transform, and a viz
@@ -374,11 +350,7 @@ func TestSaveThenOverrideMetaAndTransformAndViz(t *testing.T) {
  got := run.MustLoadDataset(t, dsPath)
 
  // This dataset is ds_ten.yaml, with an added meta component, and transform, and viz
- expect := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveThenOverrideMetaAndTransformAndViz.json")
- if diff := dstest.CompareDatasets(expect, got); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveThenOverrideMetaAndTransformAndViz.json", got)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveThenOverrideMetaAndTransformAndViz.json", got)
 }
 
 // Test that saving a full dataset with a component at the same time is an error

cmd/fsi_integration_test.go

@@ -1308,7 +1308,7 @@ run ` + "`qri save`" + ` to commit this dataset
  output = run.MustExecCombinedOutErr(t, "qri diff")
  expect = `for linked dataset [test_peer_diff_after_change/diff_change]
 
--22 elements. 6 inserts. 5 deletes.
+-23 elements. 5 inserts. 5 deletes.
 
  body: 
  0: 
@@ -1324,7 +1324,7 @@ run ` + "`qri save`" + ` to commit this dataset
  -2: 6
  +2: 321
  meta: 
- +qri: "md:0"
+  qri: "md:0"
  +title: "hello"
  qri: "ds:0"
 -stats: {"qri":"sa:0","stats":[{"count":2,"frequencies":{},"maxLength":4,"minLength":3,"type":"string"},{"count":2,"frequencies":{},"maxLength":4,"minLength":3,"type":"string"},{"count":2,"histogram":{"bins":null,"frequencies":[]},"max":6,"mean":9,"min":3,"type":"numeric"}]}
@@ -1484,7 +1484,7 @@ func TestMoveWorkingDirectory(t *testing.T) {
 
 `, map[string]string{
  "profileID": "QmeL2mdVka1eahKENjehK6tBxkkpk5dNQ1qMcgWi7Hrb4B",
- "path": "/ipfs/QmZkcwvx5akGMQ9xUXEDZAo3ZZYmeVbBGsu6noHpmsEaXq",
+ "path": "/ipfs/QmWUUi1u5hM9k3s5vicfXVqJvAtXLB3NQvpChcB86nX7kg",
  })
  if diff := cmp.Diff(expect, output); diff != "" {
  t.Errorf("unexpected (-want +got):\n%s", diff)
@@ -1525,7 +1525,7 @@ func TestRemoveWorkingDirectory(t *testing.T) {
 
 `, map[string]string{
  "profileID": "QmeL2mdVka1eahKENjehK6tBxkkpk5dNQ1qMcgWi7Hrb4B",
- "path": "/ipfs/QmZkcwvx5akGMQ9xUXEDZAo3ZZYmeVbBGsu6noHpmsEaXq",
+ "path": "/ipfs/QmWUUi1u5hM9k3s5vicfXVqJvAtXLB3NQvpChcB86nX7kg",
  })
 
  if diff := cmp.Diff(expect, output); diff != "" {

cmd/save_test.go

@@ -204,11 +204,7 @@ func TestSaveState(t *testing.T) {
  // Read dataset from IPFS and compare it to the expected value
  dsPath := run.GetPathForDataset(t, 0)
  gotDs := run.MustLoadDataset(t, dsPath)
- expectDs := dstest.LoadGoldenFile(t, "testdata/expect/TestSaveState.json")
- if diff := dstest.CompareDatasets(expectDs, gotDs); diff != "" {
- t.Errorf("dataset (-want +got):\n%s", diff)
- dstest.UpdateGoldenFileIfEnvVarSet("testdata/expect/TestSaveState.json", gotDs)
- }
+ dstest.CompareGoldenDatasetAndUpdateIfEnvVarSet(t, "testdata/expect/TestSaveState.json", gotDs)
 
  // Read data and compare it
  actual := run.ReadBodyFromIPFS(t, dsPath+"/body.csv")
@@ -332,10 +328,6 @@ func TestSaveBasicCommands(t *testing.T) {
  }
  actual := parseDatasetRefFromOutput(run.GetCommandOutput())
  expect := dstest.Template(t, c.expect, tmplData)
- // vi := run.LookupVersionInfo(t, "test_peer_save_basic/ten_movies")
- // ds := run.MustLoadDataset(t, vi.Path)
- // data, _ := json.MarshalIndent(ds, "", " ")
- // fmt.Println(string(data))
  if diff := cmp.Diff(expect, actual); diff != "" {
  t.Errorf("result mismatch (-want +got):%s\n", diff)
  }

go.mod

@@ -40,10 +40,8 @@ require (
  github.com/multiformats/go-multihash v0.0.14
  github.com/olekukonko/tablewriter v0.0.4
  github.com/pkg/errors v0.9.1
- github.com/pkg/profile v1.5.0
- github.com/qri-io/apiutil v0.2.0
  github.com/qri-io/dag v0.2.2-0.20201113214519-3219603c4d1a
- github.com/qri-io/dataset v0.2.1-0.20201118223538-aec8f29a5a2c
+ github.com/qri-io/dataset v0.2.1-0.20201119013636-577ff3fdadad
  github.com/qri-io/deepdiff v0.2.1-0.20200807143746-d02d9f531f5b
  github.com/qri-io/doggos v0.1.0
  github.com/qri-io/ioes v0.1.1

go.sum

@@ -845,6 +845,7 @@ github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.5 h1:pQkejVhF0xp08D4CQUcw8t+BFJeXowja6RVcb5p++EA=
 github.com/libp2p/go-openssl v0.0.5/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
+github.com/libp2p/go-openssl v0.0.7 h1:eCAzdLejcNVBzP/iZM9vqHnQm+XyCEbSSIheIPRGNsw=
 github.com/libp2p/go-openssl v0.0.7/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FWpFLw=
 github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
@@ -1088,8 +1089,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.5.0 h1:042Buzk+NhDI+DeSAA62RwJL8VAuZUMQZUjCsRz1Mug=
-github.com/pkg/profile v1.5.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
@@ -1125,25 +1124,12 @@ github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
 github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
 github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/qri-io/apiutil v0.2.0/go.mod h1:LbfDISrItJfXIxqMwPjZwrxeYwF0mzjQxToYydVd5aI=
 github.com/qri-io/compare v0.1.0 h1:A/MRx3uEnJ/iMjfJY1VOqH9CYs9zFSEYaFVeXuGfmis=
 github.com/qri-io/compare v0.1.0/go.mod h1:i/tVuDGRXVxhuZ8ZUieF23u6rQ6wLGJl7KKWpoMRaTE=
-github.com/qri-io/dag v0.2.2-0.20200725180936-93d90d47ff6e h1:VQVKTN05OWl2H3AALNeLpSlxD4IDX0Xzu60GZdnQ4y8=
-github.com/qri-io/dag v0.2.2-0.20200725180936-93d90d47ff6e/go.mod h1:PGnR3JnzkTvQd+t/C2/Txu2Wvkt4Rrbm94ZfO2MuHLs=
 github.com/qri-io/dag v0.2.2-0.20201113214519-3219603c4d1a h1:fAgQF42ZcW7jXccOVaWDjzzvLsMyipVO3XxbdFeSNSA=
 github.com/qri-io/dag v0.2.2-0.20201113214519-3219603c4d1a/go.mod h1:1AwOy3yhcZTAXzaF4wGSdnrp87u3PBOrsWXUjOtQCXo=
-github.com/qri-io/dataset v0.2.0 h1:c5j6VOLNzZooQEviLCLvEkjLqsyOo+Ya1/lHrgsNdD0=
-github.com/qri-io/dataset v0.2.0/go.mod h1:5zPEj0725eSTnpQmbf/JV1upPXY+DTwQ/Ic3PgQV7g0=
-github.com/qri-io/dataset v0.2.1-0.20201027203116-4e5e4591d1b8 h1:n9o214xS3aACFKq3mD/VppfaifNHL1tdbvFgP2fwOrs=
-github.com/qri-io/dataset v0.2.1-0.20201027203116-4e5e4591d1b8/go.mod h1:5zPEj0725eSTnpQmbf/JV1upPXY+DTwQ/Ic3PgQV7g0=
-github.com/qri-io/dataset v0.2.1-0.20201111010757-deda98444c9e h1:MazJmF9IgFWbygn6iFn565czvBI5s4Lv5HflSk73rSc=
-github.com/qri-io/dataset v0.2.1-0.20201111010757-deda98444c9e/go.mod h1:HtwGskdCECbOON0iVQHEEm6fykwDqharlqabc1ssj3Y=
-github.com/qri-io/dataset v0.2.1-0.20201111192041-5e173056771c h1:E+AB6FJdTNqL1zF2aCWMP/rLBDOypPpvdEapv8DRqGY=
-github.com/qri-io/dataset v0.2.1-0.20201111192041-5e173056771c/go.mod h1:HtwGskdCECbOON0iVQHEEm6fykwDqharlqabc1ssj3Y=
-github.com/qri-io/dataset v0.2.1-0.20201113211414-b678b24f2f3d h1:NGa8usXa8YBNyMIwwU7voJDy1TKyKw71Ya/R0+pljOI=
-github.com/qri-io/dataset v0.2.1-0.20201113211414-b678b24f2f3d/go.mod h1:HtwGskdCECbOON0iVQHEEm6fykwDqharlqabc1ssj3Y=
-github.com/qri-io/dataset v0.2.1-0.20201117033713-f588ddee464f h1:YmPOv3QuHhIvemA09di01sbaigGndsusbp9qtEKZOMA=
-github.com/qri-io/dataset v0.2.1-0.20201117033713-f588ddee464f/go.mod h1:HtwGskdCECbOON0iVQHEEm6fykwDqharlqabc1ssj3Y=
+github.com/qri-io/dataset v0.2.1-0.20201119013636-577ff3fdadad h1:+OvyZU74q8mS4z1smdRBUc1JX5SFXmMZRoUbtudKl6c=
+github.com/qri-io/dataset v0.2.1-0.20201119013636-577ff3fdadad/go.mod h1:HtwGskdCECbOON0iVQHEEm6fykwDqharlqabc1ssj3Y=
 github.com/qri-io/deepdiff v0.2.1-0.20200807143746-d02d9f531f5b h1:T8qEIv+qLi5mVWvSS329wJ+HbN7cfMwCWjRVzh/+upo=
 github.com/qri-io/deepdiff v0.2.1-0.20200807143746-d02d9f531f5b/go.mod h1:NrL/b7YvexgpGb4HEO3Rlx5RrMLDfxuKDf/XDAq5ac0=
 github.com/qri-io/doggos v0.1.0 h1:B7Hn9ssRGDAonMhJ4UwDtPDmG9GtvLR8f7VFec7Rs7M=
@@ -1157,19 +1143,6 @@ github.com/qri-io/jsonpointer v0.1.1/go.mod h1:DnJPaYgiKu56EuDp8TU5wFLdZIcAnb/uH
 github.com/qri-io/jsonschema v0.2.0 h1:is8lirh3HYwTkC0e+4jL/vWEHwzPLojnl4FWkUoeEPU=
 github.com/qri-io/jsonschema v0.2.0/go.mod h1:g7DPkiOsK1xv6T/Ao5scXRkd+yTFygcANPBaaqW+VrI=
 github.com/qri-io/qfs v0.1.1-0.20200623175200-23690284798a/go.mod h1:NP4Va1b0/V4nbyPdX3FmZ4cJTPatn0d5FZF5GBxcIJA=
-github.com/qri-io/qfs v0.5.1-0.20200810213433-eb06cdd4b298 h1:+OkHcMupnS/IRUScpS3/4SkCpYQOZFFepRObXNGXjzI=
-github.com/qri-io/qfs v0.5.1-0.20200810213433-eb06cdd4b298/go.mod h1:NP4Va1b0/V4nbyPdX3FmZ4cJTPatn0d5FZF5GBxcIJA=
-github.com/qri-io/qfs v0.5.1-0.20201027203612-c4d5a0634b7e h1:PoaIVHimY6c9URGHJ8bTdf7nPOcW1XlWK182CnunNHA=
-github.com/qri-io/qfs v0.5.1-0.20201027203612-c4d5a0634b7e/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
-github.com/qri-io/qfs v0.5.1-0.20201111192341-8539fa18ac4b/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
-github.com/qri-io/qfs v0.5.1-0.20201112000212-555d11059f9d h1:b0tzF6yUk5kpH20fTlca3vMjgo65FWD8RgS8lVz3Iuc=
-github.com/qri-io/qfs v0.5.1-0.20201112000212-555d11059f9d/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
-github.com/qri-io/qfs v0.5.1-0.20201113211237-068f64870da8 h1:wpFq+9Hu3q3htBp5qPj7w3LDQ+3AsA3cFDLQ8S+s/tA=
-github.com/qri-io/qfs v0.5.1-0.20201113211237-068f64870da8/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
-github.com/qri-io/qfs v0.5.1-0.20201114155452-def8067fce61 h1:26fO91I8PlqpJ5eSHSJ7b65NrcC0EiOZXYMmamtF+PU=
-github.com/qri-io/qfs v0.5.1-0.20201114155452-def8067fce61/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
-github.com/qri-io/qfs v0.5.1-0.20201117003320-f5c12e407d28 h1:1yO0fKYUHude9SGHB9iNz63OBY/w0/jmBwG1de5Q+XE=
-github.com/qri-io/qfs v0.5.1-0.20201117003320-f5c12e407d28/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
 github.com/qri-io/qfs v0.5.1-0.20201117010239-0e309e08c79d h1:7g7x61k9ojcSbOoynXi/zmOfx+Zz/zy068v4jMJiHJ4=
 github.com/qri-io/qfs v0.5.1-0.20201117010239-0e309e08c79d/go.mod h1:SU+DUq8+BfHNod1SXzmD8FrNLgPt42aKyQuO3fnFEQI=
 github.com/qri-io/starlib v0.4.2 h1:ZGzmzT9fOqdluezcwhAZAbTn/v6kMg1tC6ALVjQPhpQ=

lib/integration_test.go

@@ -21,7 +21,7 @@ import (
 
 func TestTwoActorRegistryIntegration(t *testing.T) {
  tr := NewNetworkIntegrationTestRunner(t, "integration_two_actor_registry")
- // defer tr.Cleanup()
+ defer tr.Cleanup()
 
  nasim := tr.InitNasim(t)