benjamyn/any-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Any-sync remove printlns and fix condition

Browse Source
This commit is contained in:
mcrakhman 2023-02-26 18:47:43 +01:00
parent 679b068dfa
commit 74b0269230
No known key found for this signature in database
GPG Key ID: DED12CFEF5B8396B
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commonspace/settings/settingsstate/statebuilder.go
View File

@ -1,7 +1,6 @@
package settingsstate package settingsstate
import ( import (
"fmt"
"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
"github.com/anytypeio/any-sync/commonspace/spacesyncproto" "github.com/anytypeio/any-sync/commonspace/spacesyncproto"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
@ -31,7 +30,7 @@ func (s *stateBuilder) Build(tr objecttree.ObjectTree, oldState *State) (state *
} }
process := func(change *objecttree.Change) bool { process := func(change *objecttree.Change) bool {
state = s.processChange(change, rootId, startId, state) state = s.processChange(change, rootId, state)
state.LastIteratedId = change.Id state.LastIteratedId = change.Id
return true return true
} }
@ -43,14 +42,13 @@ func (s *stateBuilder) Build(tr objecttree.ObjectTree, oldState *State) (state *
} }
return deleteChange, nil return deleteChange, nil
} }
err = tr.IterateFrom(startId, convert, process) err = tr.IterateFrom(startId, convert, process)
return return
} }
func (s *stateBuilder) processChange(change *objecttree.Change, rootId, startId string, state *State) *State { func (s *stateBuilder) processChange(change *objecttree.Change, rootId string, state *State) *State {
// ignoring root change which has empty model or startId change // ignoring root change which has empty model or startId change
if change.Model == nil || state.LastIteratedId == startId { if change.Model == nil || state.LastIteratedId == change.Id {
return state return state
} }
@ -67,12 +65,10 @@ func (s *stateBuilder) processChange(change *objecttree.Change, rootId, startId
// otherwise getting data from content // otherwise getting data from content
for _, cnt := range deleteChange.Content { for _, cnt := range deleteChange.Content {
fmt.Println(cnt.GetSpaceDelete() != nil)
switch { switch {
case cnt.GetObjectDelete() != nil: case cnt.GetObjectDelete() != nil:
state.DeletedIds = append(state.DeletedIds, cnt.GetObjectDelete().GetId()) state.DeletedIds = append(state.DeletedIds, cnt.GetObjectDelete().GetId())
case cnt.GetSpaceDelete() != nil: case cnt.GetSpaceDelete() != nil:
fmt.Println(cnt.GetSpaceDelete().GetDeleterPeerId())
state.DeleterId = cnt.GetSpaceDelete().GetDeleterPeerId() state.DeleterId = cnt.GetSpaceDelete().GetDeleterPeerId()
} }
} }

10
commonspace/settings/settingsstate/statebuilder_test.go
View File

@ -16,8 +16,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
t.Run("empty model", func(t *testing.T) { t.Run("empty model", func(t *testing.T) {
ch := &objecttree.Change{} ch := &objecttree.Change{}
startId := "startId" newSt := sb.processChange(ch, rootId, &State{
newSt := sb.processChange(ch, rootId, startId, &State{
DeletedIds: []string{deletedId}, DeletedIds: []string{deletedId},
}) })
require.Equal(t, []string{deletedId}, newSt.DeletedIds) require.Equal(t, []string{deletedId}, newSt.DeletedIds)
@ -34,7 +33,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
} }
ch.Id = "startId" ch.Id = "startId"
startId := "startId" startId := "startId"
newSt := sb.processChange(ch, rootId, startId, &State{ newSt := sb.processChange(ch, rootId, &State{
DeletedIds: []string{deletedId}, DeletedIds: []string{deletedId},
LastIteratedId: startId, LastIteratedId: startId,
}) })
@ -50,7 +49,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
}, },
} }
ch.Id = "rootId" ch.Id = "rootId"
newSt := sb.processChange(ch, rootId, rootId, &State{}) newSt := sb.processChange(ch, rootId, &State{})
require.Equal(t, []string{"id1", "id2"}, newSt.DeletedIds) require.Equal(t, []string{"id1", "id2"}, newSt.DeletedIds)
require.Equal(t, "peerId", newSt.DeleterId) require.Equal(t, "peerId", newSt.DeleterId)
}) })
@ -65,8 +64,7 @@ func TestStateBuilder_ProcessChange(t *testing.T) {
}, },
} }
ch.Id = "someId" ch.Id = "someId"
startId := "startId" newSt := sb.processChange(ch, rootId, &State{})
newSt := sb.processChange(ch, rootId, startId, &State{})
require.Equal(t, []string{deletedId}, newSt.DeletedIds) require.Equal(t, []string{deletedId}, newSt.DeletedIds)
}) })
} }