Fix error in test

go/libraries/doltcore/dtestutils/environment.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
 	"github.com/stretchr/testify/require"
 
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
@@ -88,13 +89,52 @@ func CreateEnvWithSeedData(t *testing.T) *env.DoltEnv {
 	tbl, err = editor.RebuildAllIndexes(ctx, tbl)
 	require.NoError(t, err)
 
-	working, err := dEnv.WorkingRoot(ctx)
+	sch, err = tbl.GetSchema(ctx)
 	require.NoError(t, err)
-	working, err = working.PutTable(ctx, TableName, tbl)
+	rows, err := tbl.GetRowData(ctx)
 	require.NoError(t, err)
-
-	err = dEnv.UpdateWorkingRoot(ctx, working)
+	indexes, err := tbl.GetIndexData(ctx)
+	require.NoError(t, err)
+	err = putTableToWorking(ctx, dEnv, sch, rows, indexes, TableName, nil)
 	require.NoError(t, err)
 
 	return dEnv
 }
+
+func putTableToWorking(ctx context.Context, dEnv *env.DoltEnv, sch schema.Schema, rows types.Map, indexData types.Map, tableName string, autoVal types.Value) error {
+	root, err := dEnv.WorkingRoot(ctx)
+	if err != nil {
+		return doltdb.ErrNomsIO
+	}
+
+	vrw := dEnv.DoltDB.ValueReadWriter()
+	schVal, err := encoding.MarshalSchemaAsNomsValue(ctx, vrw, sch)
+	if err != nil {
+		return env.ErrMarshallingSchema
+	}
+
+	tbl, err := doltdb.NewTable(ctx, vrw, schVal, rows, indexData, autoVal)
+	if err != nil {
+		return err
+	}
+
+	newRoot, err := root.PutTable(ctx, tableName, tbl)
+	if err != nil {
+		return err
+	}
+
+	rootHash, err := root.HashOf()
+	if err != nil {
+		return err
+	}
+
+	newRootHash, err := newRoot.HashOf()
+	if err != nil {
+		return err
+	}
+	if rootHash == newRootHash {
+		return nil
+	}
+
+	return dEnv.UpdateWorkingRoot(ctx, newRoot)
+}

go/libraries/doltcore/dtestutils/schema.go

@@ -119,12 +119,13 @@ func CreateTestTable(t *testing.T, dEnv *env.DoltEnv, tableName string, sch sche
 	tbl, err = editor.RebuildAllIndexes(ctx, tbl)
 	require.NoError(t, err)
 
-	working, err := dEnv.WorkingRoot(ctx)
+	sch, err = tbl.GetSchema(ctx)
 	require.NoError(t, err)
-	working, err = working.PutTable(ctx, TableName, tbl)
+	rows, err := tbl.GetRowData(ctx)
 	require.NoError(t, err)
-
-	err = dEnv.UpdateWorkingRoot(ctx, working)
+	indexes, err := tbl.GetIndexData(ctx)
+	require.NoError(t, err)
+	err = putTableToWorking(ctx, dEnv, sch, rows, indexes, tableName, nil)
 	require.NoError(t, err)
 }
 

go/libraries/doltcore/env/environment.go

@@ -35,8 +35,6 @@ import (
 	"github.com/dolthub/dolt/go/libraries/doltcore/doltdocs"
 	"github.com/dolthub/dolt/go/libraries/doltcore/grpcendpoint"
 	"github.com/dolthub/dolt/go/libraries/doltcore/ref"
-	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
-	"github.com/dolthub/dolt/go/libraries/doltcore/schema/encoding"
 	"github.com/dolthub/dolt/go/libraries/utils/filesys"
 	"github.com/dolthub/dolt/go/store/hash"
 	"github.com/dolthub/dolt/go/store/types"
@@ -1001,4 +999,4 @@ func GetGCKeepers(ctx context.Context, env *DoltEnv) ([]hash.Hash, error) {
 	}
 
 	return keepers, nil
-}
+}