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

Further fixes including tests

Browse Source
This commit is contained in:
mcrakhman 2022-07-04 13:28:16 +02:00 committed by Mikhail Iudin
parent 64a78a96cb
commit 11cd75fe17
No known key found for this signature in database
GPG Key ID: FAAAA8BAABDFF1C0
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/acltreebuilder.go
View File

@ -13,7 +13,6 @@ import (
type ACLTreeBuilder struct { type ACLTreeBuilder struct {
cache map[string]*Change cache map[string]*Change
logHeads map[string]*Change
identityKeys map[string]threadmodels.SigningPubKey identityKeys map[string]threadmodels.SigningPubKey
signingPubKeyDecoder threadmodels.SigningPubKeyDecoder signingPubKeyDecoder threadmodels.SigningPubKeyDecoder
tree *Tree tree *Tree
@ -23,7 +22,6 @@ type ACLTreeBuilder struct {
func NewACLTreeBuilder(t threadmodels.Thread, decoder threadmodels.SigningPubKeyDecoder) *ACLTreeBuilder { func NewACLTreeBuilder(t threadmodels.Thread, decoder threadmodels.SigningPubKeyDecoder) *ACLTreeBuilder {
return &ACLTreeBuilder{ return &ACLTreeBuilder{
cache: make(map[string]*Change), cache: make(map[string]*Change),
logHeads: make(map[string]*Change),
identityKeys: make(map[string]threadmodels.SigningPubKey), identityKeys: make(map[string]threadmodels.SigningPubKey),
signingPubKeyDecoder: decoder, signingPubKeyDecoder: decoder,
tree: &Tree{}, // TODO: add NewTree method tree: &Tree{}, // TODO: add NewTree method

4
data/documentstatebuilder_test.go
View File

@ -24,7 +24,7 @@ func TestDocumentStateBuilder_UserJoinBuild(t *testing.T) {
} }
st := ctx.DocState.(*PlainTextDocumentState) st := ctx.DocState.(*PlainTextDocumentState)
assert.Equal(t, st.Text, "") assert.Equal(t, st.Text, "some text|first")
} }
func TestDocumentStateBuilder_UserRemoveBuild(t *testing.T) { func TestDocumentStateBuilder_UserRemoveBuild(t *testing.T) {
@ -44,5 +44,5 @@ func TestDocumentStateBuilder_UserRemoveBuild(t *testing.T) {
} }
st := ctx.DocState.(*PlainTextDocumentState) st := ctx.DocState.(*PlainTextDocumentState)
assert.Equal(t, st.Text, "") assert.Equal(t, st.Text, "some text|first")
} }

2
data/plaintextdocstate.go
View File

@ -40,7 +40,7 @@ func (p *PlainTextDocumentState) applyChange(ch *pb.PlainTextChangeContent) erro
switch { switch {
case ch.GetTextAppend() != nil: case ch.GetTextAppend() != nil:
text := ch.GetTextAppend().GetText() text := ch.GetTextAppend().GetText()
p.Text += text p.Text += "|" + text
} }
return nil return nil
} }

1
data/tree.go
View File

@ -130,6 +130,7 @@ func (t *Tree) RemoveInvalidChange(id string) {
stack = append(stack, el.Id) stack = append(stack, el.Id)
} }
} }
t.updateHeads()
} }
func (t *Tree) add(c *Change) (attached bool) { func (t *Tree) add(c *Change) (attached bool) {

2
data/treebuilder.go
View File

@ -21,7 +21,6 @@ var (
type TreeBuilder struct { type TreeBuilder struct {
cache map[string]*Change cache map[string]*Change
logHeads map[string]*Change
identityKeys map[string]threadmodels.SigningPubKey identityKeys map[string]threadmodels.SigningPubKey
signingPubKeyDecoder threadmodels.SigningPubKeyDecoder signingPubKeyDecoder threadmodels.SigningPubKeyDecoder
tree *Tree tree *Tree
@ -31,7 +30,6 @@ type TreeBuilder struct {
func NewTreeBuilder(t threadmodels.Thread, decoder threadmodels.SigningPubKeyDecoder) *TreeBuilder { func NewTreeBuilder(t threadmodels.Thread, decoder threadmodels.SigningPubKeyDecoder) *TreeBuilder {
return &TreeBuilder{ return &TreeBuilder{
cache: make(map[string]*Change), cache: make(map[string]*Change),
logHeads: make(map[string]*Change),
identityKeys: make(map[string]threadmodels.SigningPubKey), identityKeys: make(map[string]threadmodels.SigningPubKey),
signingPubKeyDecoder: decoder, signingPubKeyDecoder: decoder,
tree: &Tree{}, // TODO: add NewTree method tree: &Tree{}, // TODO: add NewTree method