1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00

Merge branch 'main' into GO-2482-full-sync-request-max-size

# Conflicts:
#	commonspace/object/tree/synctree/mock_synctree/mock_synctree.go
#	commonspace/object/tree/synctree/synctree.go
#	commonspace/object/tree/synctree/synctreehandler.go
#	commonspace/object/tree/synctree/synctreehandler_test.go
#	commonspace/object/tree/synctree/treesyncprotocol.go
#	commonspace/object/tree/synctree/treesyncprotocol_test.go
#	commonspace/spaceutils_test.go
#	net/streampool/streampool.go
This commit is contained in:
mcrakhman 2024-08-23 23:20:45 +02:00
commit 3fec782d97
No known key found for this signature in database
GPG key ID: DED12CFEF5B8396B
17 changed files with 1298 additions and 239 deletions

View file

@ -1246,7 +1246,7 @@ func TestObjectTree(t *testing.T) {
}
deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
hTree, err := buildHistoryTree(deps, HistoryTreeParams{
BeforeId: "6",
Heads: []string{"6"},
IncludeBeforeId: false,
})
require.NoError(t, err)
@ -1277,9 +1277,7 @@ func TestObjectTree(t *testing.T) {
changeCreator.CreateRaw("6", aclList.Head().Id, "5", false, "5"),
}
deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
hTree, err := buildHistoryTree(deps, HistoryTreeParams{
BuildFullTree: true,
})
hTree, err := buildHistoryTree(deps, HistoryTreeParams{})
require.NoError(t, err)
// check tree heads
assert.Equal(t, []string{"6"}, hTree.Heads())
@ -1308,8 +1306,7 @@ func TestObjectTree(t *testing.T) {
}
deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
hTree, err := buildHistoryTree(deps, HistoryTreeParams{
BeforeId: "6",
IncludeBeforeId: true,
Heads: []string{"6"}, IncludeBeforeId: true,
})
require.NoError(t, err)
// check tree heads
@ -1329,7 +1326,7 @@ func TestObjectTree(t *testing.T) {
t.Run("test history tree root", func(t *testing.T) {
_, deps := prepareHistoryTreeDeps(aclList)
hTree, err := buildHistoryTree(deps, HistoryTreeParams{
BeforeId: "0",
Heads: []string{"0"},
IncludeBeforeId: true,
})
require.NoError(t, err)