Remove rawLoader

commonspace/object/tree/objecttree/objecttree.go

@@ -103,14 +103,13 @@ type ObjectTree interface {
 }
 
 type objectTree struct {
-	treeStorage     treestorage.TreeStorage
-	storage         Storage
-	changeBuilder   ChangeBuilder
-	validator       ObjectTreeValidator
-	rawChangeLoader *rawChangeLoader
-	treeBuilder     *treeBuilder
-	aclList         list.AclList
-	flusher         Flusher
+	treeStorage   treestorage.TreeStorage
+	storage       Storage
+	changeBuilder ChangeBuilder
+	validator     ObjectTreeValidator
+	treeBuilder   *treeBuilder
+	aclList       list.AclList
+	flusher       Flusher
 
 	id      string
 	rawRoot *treechangeproto.RawTreeChangeWithId

commonspace/object/tree/objecttree/treebuilder.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
 )
 
 var (
@@ -19,11 +18,9 @@ var (
 )
 
 type treeBuilder struct {
-	treeStorage treestorage.TreeStorage
-	builder     ChangeBuilder
-	loader      *rawChangeLoader
-	storage     Storage
-	ctx         context.Context
+	builder ChangeBuilder
+	storage Storage
+	ctx     context.Context
 
 	// buffers
 	idStack    []string
@@ -39,11 +36,10 @@ type treeBuilderOpts struct {
 	newChanges        []*Change
 }
 
-func newTreeBuilder(keepData bool, storage treestorage.TreeStorage, builder ChangeBuilder, loader *rawChangeLoader) *treeBuilder {
+func newTreeBuilder(storage Storage, builder ChangeBuilder) *treeBuilder {
 	return &treeBuilder{
-		treeStorage: storage,
-		builder:     builder,
-		loader:      loader,
+		storage: storage,
+		builder: builder,
 	}
 }