From d2c9fd4500c17bdcb4ceed0b2ee65db914787ae1 Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Wed, 13 Jul 2022 19:17:50 +0300 Subject: [PATCH] move acl tree files to acl folder --- {account => acl/account}/accountdata.go | 0 {aclchanges => acl/aclchanges}/change.go | 4 ++- .../aclchanges}/pb/aclchanges.pb.go | 0 .../aclchanges}/pb/protos/aclchanges.proto | 0 {acltree => acl/acltree}/aclstate.go | 5 ++- {acltree => acl/acltree}/aclstatebuilder.go | 4 +-- {acltree => acl/acltree}/acltree.go | 4 +-- {acltree => acl/acltree}/acltree_test.go | 7 ++-- {acltree => acl/acltree}/acltreebuilder.go | 2 +- {acltree => acl/acltree}/change.go | 4 +-- {acltree => acl/acltree}/changebuilder.go | 4 +-- {acltree => acl/acltree}/changeloader.go | 4 +-- {acltree => acl/acltree}/snapshotvalidator.go | 2 +- {acltree => acl/acltree}/threadutility.go | 4 +-- .../acltree}/threadutility_test.go | 8 ++--- {acltree => acl/acltree}/tree.go | 0 {acltree => acl/acltree}/treebuilder.go | 2 +- {acltree => acl/acltree}/treebuilder_test.go | 0 {acltree => acl/acltree}/treegraph.go | 0 {acltree => acl/acltree}/treegraph_nix.go | 0 {acltree => acl/acltree}/treeiterator.go | 0 .../plaintextdocument}/document.go | 32 +++++++++---------- .../plaintextdocument}/document_test.go | 6 ++-- .../plaintextdocument}/plaintextdocstate.go | 2 +- .../pb/protos/testdocumentchanges.proto | 0 .../testchanges/pb/testdocumentchanges.pb.go | 0 .../testutils}/threadbuilder/keychain.go | 0 .../testutils}/threadbuilder/threadbuilder.go | 26 +++++++-------- .../threadbuilder/threadbuildergraph.go | 0 .../threadbuilder/threadbuildergraph_nix.go | 3 +- .../testutils}/threadbuilder/ymlentities.go | 0 .../threadbuilder/ymlentities_test.go | 0 .../yamltests/invalidsnapshotexample.yml | 0 .../testutils}/yamltests/path.go | 0 .../testutils}/yamltests/userjoinexample.yml | 0 .../yamltests/userjoinexampleupdate.yml | 0 .../yamltests/userremovebeforeexample.yml | 0 .../yamltests/userremoveexample.yml | 0 .../yamltests/validsnapshotexample.yml | 0 {thread => acl/thread}/inmemory.go | 4 +-- {thread => acl/thread}/models.go | 5 ++- {thread => acl/thread}/pb/protos/thread.proto | 0 {thread => acl/thread}/pb/thread.pb.go | 0 {thread => acl/thread}/threadid.go | 0 {thread => acl/thread}/threadid_test.go | 0 45 files changed, 65 insertions(+), 67 deletions(-) rename {account => acl/account}/accountdata.go (100%) rename {aclchanges => acl/aclchanges}/change.go (61%) rename {aclchanges => acl/aclchanges}/pb/aclchanges.pb.go (100%) rename {aclchanges => acl/aclchanges}/pb/protos/aclchanges.proto (100%) rename {acltree => acl/acltree}/aclstate.go (99%) rename {acltree => acl/acltree}/aclstatebuilder.go (98%) rename {acltree => acl/acltree}/acltree.go (98%) rename {acltree => acl/acltree}/acltree_test.go (97%) rename {acltree => acl/acltree}/acltreebuilder.go (97%) rename {acltree => acl/acltree}/change.go (96%) rename {acltree => acl/acltree}/changebuilder.go (97%) rename {acltree => acl/acltree}/changeloader.go (96%) rename {acltree => acl/acltree}/snapshotvalidator.go (93%) rename {acltree => acl/acltree}/threadutility.go (84%) rename {acltree => acl/acltree}/threadutility_test.go (83%) rename {acltree => acl/acltree}/tree.go (100%) rename {acltree => acl/acltree}/treebuilder.go (98%) rename {acltree => acl/acltree}/treebuilder_test.go (100%) rename {acltree => acl/acltree}/treegraph.go (100%) rename {acltree => acl/acltree}/treegraph_nix.go (100%) rename {acltree => acl/acltree}/treeiterator.go (100%) rename {plaintextdocument => acl/plaintextdocument}/document.go (76%) rename {plaintextdocument => acl/plaintextdocument}/document_test.go (85%) rename {plaintextdocument => acl/plaintextdocument}/plaintextdocstate.go (93%) rename {testutils => acl/testutils}/testchanges/pb/protos/testdocumentchanges.proto (100%) rename {testutils => acl/testutils}/testchanges/pb/testdocumentchanges.pb.go (100%) rename {testutils => acl/testutils}/threadbuilder/keychain.go (100%) rename {testutils => acl/testutils}/threadbuilder/threadbuilder.go (95%) rename {testutils => acl/testutils}/threadbuilder/threadbuildergraph.go (100%) rename {testutils => acl/testutils}/threadbuilder/threadbuildergraph_nix.go (99%) rename {testutils => acl/testutils}/threadbuilder/ymlentities.go (100%) rename {testutils => acl/testutils}/threadbuilder/ymlentities_test.go (100%) rename {testutils => acl/testutils}/yamltests/invalidsnapshotexample.yml (100%) rename {testutils => acl/testutils}/yamltests/path.go (100%) rename {testutils => acl/testutils}/yamltests/userjoinexample.yml (100%) rename {testutils => acl/testutils}/yamltests/userjoinexampleupdate.yml (100%) rename {testutils => acl/testutils}/yamltests/userremovebeforeexample.yml (100%) rename {testutils => acl/testutils}/yamltests/userremoveexample.yml (100%) rename {testutils => acl/testutils}/yamltests/validsnapshotexample.yml (100%) rename {thread => acl/thread}/inmemory.go (96%) rename {thread => acl/thread}/models.go (88%) rename {thread => acl/thread}/pb/protos/thread.proto (100%) rename {thread => acl/thread}/pb/thread.pb.go (100%) rename {thread => acl/thread}/threadid.go (100%) rename {thread => acl/thread}/threadid_test.go (100%) diff --git a/account/accountdata.go b/acl/account/accountdata.go similarity index 100% rename from account/accountdata.go rename to acl/account/accountdata.go diff --git a/aclchanges/change.go b/acl/aclchanges/change.go similarity index 61% rename from aclchanges/change.go rename to acl/aclchanges/change.go index f8253ace..9e63f1fc 100644 --- a/aclchanges/change.go +++ b/acl/aclchanges/change.go @@ -1,6 +1,8 @@ package aclchanges -import "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" +import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" +) type Change interface { ProtoChange() *pb.ACLChange diff --git a/aclchanges/pb/aclchanges.pb.go b/acl/aclchanges/pb/aclchanges.pb.go similarity index 100% rename from aclchanges/pb/aclchanges.pb.go rename to acl/aclchanges/pb/aclchanges.pb.go diff --git a/aclchanges/pb/protos/aclchanges.proto b/acl/aclchanges/pb/protos/aclchanges.proto similarity index 100% rename from aclchanges/pb/protos/aclchanges.proto rename to acl/aclchanges/pb/protos/aclchanges.proto diff --git a/acltree/aclstate.go b/acl/acltree/aclstate.go similarity index 99% rename from acltree/aclstate.go rename to acl/acltree/aclstate.go index 9f9a5347..066ea869 100644 --- a/acltree/aclstate.go +++ b/acl/acltree/aclstate.go @@ -4,11 +4,10 @@ import ( "bytes" "errors" "fmt" - "hash/fnv" - - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/textileio/go-threads/crypto/symmetric" + "hash/fnv" ) var ErrNoSuchUser = errors.New("no such user") diff --git a/acltree/aclstatebuilder.go b/acl/acltree/aclstatebuilder.go similarity index 98% rename from acltree/aclstatebuilder.go rename to acl/acltree/aclstatebuilder.go index 7774d9c5..537c5fff 100644 --- a/acltree/aclstatebuilder.go +++ b/acl/acltree/aclstatebuilder.go @@ -2,9 +2,9 @@ package acltree import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acltree/acltree.go b/acl/acltree/acltree.go similarity index 98% rename from acltree/acltree.go rename to acl/acltree/acltree.go index 82aa688c..737c134c 100644 --- a/acltree/acltree.go +++ b/acl/acltree/acltree.go @@ -1,10 +1,10 @@ package acltree import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acltree/acltree_test.go b/acl/acltree/acltree_test.go similarity index 97% rename from acltree/acltree_test.go rename to acl/acltree/acltree_test.go index 8039e0b8..b474db73 100644 --- a/acltree/acltree_test.go +++ b/acl/acltree/acltree_test.go @@ -1,13 +1,12 @@ package acltree import ( + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/threadbuilder" "testing" "github.com/stretchr/testify/assert" - - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/threadbuilder" ) type mockListener struct{} diff --git a/acltree/acltreebuilder.go b/acl/acltree/acltreebuilder.go similarity index 97% rename from acltree/acltreebuilder.go rename to acl/acltree/acltreebuilder.go index dfb855fe..b9cc1456 100644 --- a/acltree/acltreebuilder.go +++ b/acl/acltree/acltreebuilder.go @@ -2,8 +2,8 @@ package acltree import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" ) diff --git a/acltree/change.go b/acl/acltree/change.go similarity index 96% rename from acltree/change.go rename to acl/acltree/change.go index 5f3121b3..5d491ce0 100644 --- a/acltree/change.go +++ b/acl/acltree/change.go @@ -2,10 +2,10 @@ package acltree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "github.com/gogo/protobuf/proto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" "github.com/textileio/go-threads/crypto/symmetric" ) diff --git a/acltree/changebuilder.go b/acl/acltree/changebuilder.go similarity index 97% rename from acltree/changebuilder.go rename to acl/acltree/changebuilder.go index 1c97397c..676ed477 100644 --- a/acltree/changebuilder.go +++ b/acl/acltree/changebuilder.go @@ -1,8 +1,8 @@ package acltree import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cid" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/gogo/protobuf/proto" diff --git a/acltree/changeloader.go b/acl/acltree/changeloader.go similarity index 96% rename from acltree/changeloader.go rename to acl/acltree/changeloader.go index 82c3df99..f227f8ce 100644 --- a/acltree/changeloader.go +++ b/acl/acltree/changeloader.go @@ -3,10 +3,10 @@ package acltree import ( "context" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/gogo/protobuf/proto" ) diff --git a/acltree/snapshotvalidator.go b/acl/acltree/snapshotvalidator.go similarity index 93% rename from acltree/snapshotvalidator.go rename to acl/acltree/snapshotvalidator.go index f4479859..627a9e9d 100644 --- a/acltree/snapshotvalidator.go +++ b/acl/acltree/snapshotvalidator.go @@ -2,8 +2,8 @@ package acltree import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acltree/threadutility.go b/acl/acltree/threadutility.go similarity index 84% rename from acltree/threadutility.go rename to acl/acltree/threadutility.go index 034ea2fd..a9c7b98e 100644 --- a/acltree/threadutility.go +++ b/acl/acltree/threadutility.go @@ -1,8 +1,8 @@ package acltree import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acltree/threadutility_test.go b/acl/acltree/threadutility_test.go similarity index 83% rename from acltree/threadutility_test.go rename to acl/acltree/threadutility_test.go index 91258127..53cef313 100644 --- a/acltree/threadutility_test.go +++ b/acl/acltree/threadutility_test.go @@ -2,10 +2,10 @@ package acltree import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/threadbuilder" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/threadbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "github.com/stretchr/testify/assert" "testing" ) diff --git a/acltree/tree.go b/acl/acltree/tree.go similarity index 100% rename from acltree/tree.go rename to acl/acltree/tree.go diff --git a/acltree/treebuilder.go b/acl/acltree/treebuilder.go similarity index 98% rename from acltree/treebuilder.go rename to acl/acltree/treebuilder.go index 1a34a3ae..65a36072 100644 --- a/acltree/treebuilder.go +++ b/acl/acltree/treebuilder.go @@ -3,8 +3,8 @@ package acltree import ( "errors" "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" //"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/lib/logging" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" diff --git a/acltree/treebuilder_test.go b/acl/acltree/treebuilder_test.go similarity index 100% rename from acltree/treebuilder_test.go rename to acl/acltree/treebuilder_test.go diff --git a/acltree/treegraph.go b/acl/acltree/treegraph.go similarity index 100% rename from acltree/treegraph.go rename to acl/acltree/treegraph.go diff --git a/acltree/treegraph_nix.go b/acl/acltree/treegraph_nix.go similarity index 100% rename from acltree/treegraph_nix.go rename to acl/acltree/treegraph_nix.go diff --git a/acltree/treeiterator.go b/acl/acltree/treeiterator.go similarity index 100% rename from acltree/treeiterator.go rename to acl/acltree/treeiterator.go diff --git a/plaintextdocument/document.go b/acl/plaintextdocument/document.go similarity index 76% rename from plaintextdocument/document.go rename to acl/plaintextdocument/document.go index 63c07bde..0bb1b514 100644 --- a/plaintextdocument/document.go +++ b/acl/plaintextdocument/document.go @@ -2,12 +2,12 @@ package plaintextdocument import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + aclpb "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + acltree2 "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/acltree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" + thread2 "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - aclpb "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acltree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/testchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" "github.com/gogo/protobuf/proto" ) @@ -18,7 +18,7 @@ type PlainTextDocument interface { type plainTextDocument struct { heads []string - aclTree acltree.ACLTree + aclTree acltree2.ACLTree state *DocumentState } @@ -30,7 +30,7 @@ func (p *plainTextDocument) Text() string { } func (p *plainTextDocument) AddText(text string) error { - _, err := p.aclTree.AddContent(func(builder acltree.ChangeBuilder) error { + _, err := p.aclTree.AddContent(func(builder acltree2.ChangeBuilder) error { builder.AddChangeContent( &pb.PlainTextChangeData{ Content: []*pb.PlainTextChangeContent{ @@ -42,7 +42,7 @@ func (p *plainTextDocument) AddText(text string) error { return err } -func (p *plainTextDocument) Update(tree acltree.ACLTree) { +func (p *plainTextDocument) Update(tree acltree2.ACLTree) { p.aclTree = tree var err error defer func() { @@ -54,7 +54,7 @@ func (p *plainTextDocument) Update(tree acltree.ACLTree) { prevHeads := p.heads p.heads = tree.Heads() startId := prevHeads[0] - tree.IterateFrom(startId, func(change *acltree.Change) (isContinue bool) { + tree.IterateFrom(startId, func(change *acltree2.Change) (isContinue bool) { if change.Id == startId { return true } @@ -68,7 +68,7 @@ func (p *plainTextDocument) Update(tree acltree.ACLTree) { }) } -func (p *plainTextDocument) Rebuild(tree acltree.ACLTree) { +func (p *plainTextDocument) Rebuild(tree acltree2.ACLTree) { p.aclTree = tree p.heads = tree.Heads() var startId string @@ -92,7 +92,7 @@ func (p *plainTextDocument) Rebuild(tree acltree.ACLTree) { } startId = rootChange.Id - tree.Iterate(func(change *acltree.Change) (isContinue bool) { + tree.Iterate(func(change *acltree2.Change) (isContinue bool) { if startId == change.Id { return true } @@ -111,14 +111,14 @@ func (p *plainTextDocument) Rebuild(tree acltree.ACLTree) { } func NewInMemoryPlainTextDocument(acc *account.AccountData, text string) (PlainTextDocument, error) { - return NewPlainTextDocument(acc, thread.NewInMemoryThread, text) + return NewPlainTextDocument(acc, thread2.NewInMemoryThread, text) } func NewPlainTextDocument( acc *account.AccountData, - create func(change *thread.RawChange) (thread.Thread, error), + create func(change *thread2.RawChange) (thread2.Thread, error), text string) (PlainTextDocument, error) { - changeBuilder := func(builder acltree.ChangeBuilder) error { + changeBuilder := func(builder acltree2.ChangeBuilder) error { err := builder.UserAdd(acc.Identity, acc.EncKey.GetPublic(), aclpb.ACLChange_Admin) if err != nil { return err @@ -126,7 +126,7 @@ func NewPlainTextDocument( builder.AddChangeContent(createInitialChangeContent(text)) return nil } - t, err := acltree.BuildThreadWithACL( + t, err := acltree2.BuildThreadWithACL( acc, changeBuilder, create) @@ -139,7 +139,7 @@ func NewPlainTextDocument( aclTree: nil, state: nil, } - tree, err := acltree.BuildACLTree(t, acc, doc) + tree, err := acltree2.BuildACLTree(t, acc, doc) if err != nil { return nil, err } diff --git a/plaintextdocument/document_test.go b/acl/plaintextdocument/document_test.go similarity index 85% rename from plaintextdocument/document_test.go rename to acl/plaintextdocument/document_test.go index 204115a0..31f8e365 100644 --- a/plaintextdocument/document_test.go +++ b/acl/plaintextdocument/document_test.go @@ -1,9 +1,9 @@ package plaintextdocument import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/account" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/threadbuilder" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/threadbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" "github.com/stretchr/testify/assert" "testing" ) diff --git a/plaintextdocument/plaintextdocstate.go b/acl/plaintextdocument/plaintextdocstate.go similarity index 93% rename from plaintextdocument/plaintextdocstate.go rename to acl/plaintextdocument/plaintextdocstate.go index d7447b03..aed89c28 100644 --- a/plaintextdocument/plaintextdocstate.go +++ b/acl/plaintextdocument/plaintextdocstate.go @@ -2,8 +2,8 @@ package plaintextdocument import ( "fmt" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/testchanges/pb" "github.com/gogo/protobuf/proto" ) diff --git a/testutils/testchanges/pb/protos/testdocumentchanges.proto b/acl/testutils/testchanges/pb/protos/testdocumentchanges.proto similarity index 100% rename from testutils/testchanges/pb/protos/testdocumentchanges.proto rename to acl/testutils/testchanges/pb/protos/testdocumentchanges.proto diff --git a/testutils/testchanges/pb/testdocumentchanges.pb.go b/acl/testutils/testchanges/pb/testdocumentchanges.pb.go similarity index 100% rename from testutils/testchanges/pb/testdocumentchanges.pb.go rename to acl/testutils/testchanges/pb/testdocumentchanges.pb.go diff --git a/testutils/threadbuilder/keychain.go b/acl/testutils/threadbuilder/keychain.go similarity index 100% rename from testutils/threadbuilder/keychain.go rename to acl/testutils/threadbuilder/keychain.go diff --git a/testutils/threadbuilder/threadbuilder.go b/acl/testutils/threadbuilder/threadbuilder.go similarity index 95% rename from testutils/threadbuilder/threadbuilder.go rename to acl/testutils/threadbuilder/threadbuilder.go index 9778a607..0dd68e25 100644 --- a/testutils/threadbuilder/threadbuilder.go +++ b/acl/testutils/threadbuilder/threadbuilder.go @@ -3,8 +3,12 @@ package threadbuilder import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges" - "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/yamltests" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/yamltests" + thread2 "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" + threadpb "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" "io/ioutil" "path" @@ -12,10 +16,6 @@ import ( "github.com/gogo/protobuf/proto" "gopkg.in/yaml.v3" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges/pb" - testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/testchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread" - threadpb "github.com/anytypeio/go-anytype-infrastructure-experiments/thread/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) @@ -87,7 +87,7 @@ func (t *ThreadBuilder) Heads() []string { return t.heads } -func (t *ThreadBuilder) AddRawChange(change *thread.RawChange) error { +func (t *ThreadBuilder) AddRawChange(change *thread2.RawChange) error { aclChange := new(pb.ACLChange) var err error @@ -162,12 +162,12 @@ func (t *ThreadBuilder) RemoveOrphans(orphans ...string) { t.orphans = slice.Difference(t.orphans, orphans) } -func (t *ThreadBuilder) GetChange(ctx context.Context, recordID string) (*thread.RawChange, error) { +func (t *ThreadBuilder) GetChange(ctx context.Context, recordID string) (*thread2.RawChange, error) { return t.getChange(recordID, t.allChanges), nil } -func (t *ThreadBuilder) GetUpdates(useCase string) []*thread.RawChange { - var res []*thread.RawChange +func (t *ThreadBuilder) GetUpdates(useCase string) []*thread2.RawChange { + var res []*thread2.RawChange update := t.updates[useCase] for _, ch := range update.changes { rawCh := t.getChange(ch.id, update.changes) @@ -180,7 +180,7 @@ func (t *ThreadBuilder) Header() *threadpb.ThreadHeader { return t.header } -func (t *ThreadBuilder) getChange(changeId string, m map[string]*threadChange) *thread.RawChange { +func (t *ThreadBuilder) getChange(changeId string, m map[string]*threadChange) *thread2.RawChange { rec := m[changeId] if rec.changesDataDecrypted != nil { @@ -202,7 +202,7 @@ func (t *ThreadBuilder) getChange(changeId string, m map[string]*threadChange) * panic("should be able to sign final acl message!") } - transformedRec := &thread.RawChange{ + transformedRec := &thread2.RawChange{ Payload: aclMarshaled, Signature: signature, Id: changeId, @@ -279,7 +279,7 @@ func (t *ThreadBuilder) parseThreadId(description *ThreadDescription) string { panic("no author in thread") } key := t.keychain.SigningKeys[description.Author] - id, err := thread.CreateACLThreadID(key.GetPublic(), plainTextDocType) + id, err := thread2.CreateACLThreadID(key.GetPublic(), plainTextDocType) if err != nil { panic(err) } diff --git a/testutils/threadbuilder/threadbuildergraph.go b/acl/testutils/threadbuilder/threadbuildergraph.go similarity index 100% rename from testutils/threadbuilder/threadbuildergraph.go rename to acl/testutils/threadbuilder/threadbuildergraph.go diff --git a/testutils/threadbuilder/threadbuildergraph_nix.go b/acl/testutils/threadbuilder/threadbuildergraph_nix.go similarity index 99% rename from testutils/threadbuilder/threadbuildergraph_nix.go rename to acl/testutils/threadbuilder/threadbuildergraph_nix.go index cca8ad30..af56f17e 100644 --- a/testutils/threadbuilder/threadbuildergraph_nix.go +++ b/acl/testutils/threadbuilder/threadbuildergraph_nix.go @@ -9,14 +9,13 @@ package threadbuilder import ( "fmt" + testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" "github.com/gogo/protobuf/proto" "strings" "unicode" "github.com/awalterschulze/gographviz" - - testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/testchanges/pb" ) // To quickly look at visualized string you can use https://dreampuf.github.io/GraphvizOnline diff --git a/testutils/threadbuilder/ymlentities.go b/acl/testutils/threadbuilder/ymlentities.go similarity index 100% rename from testutils/threadbuilder/ymlentities.go rename to acl/testutils/threadbuilder/ymlentities.go diff --git a/testutils/threadbuilder/ymlentities_test.go b/acl/testutils/threadbuilder/ymlentities_test.go similarity index 100% rename from testutils/threadbuilder/ymlentities_test.go rename to acl/testutils/threadbuilder/ymlentities_test.go diff --git a/testutils/yamltests/invalidsnapshotexample.yml b/acl/testutils/yamltests/invalidsnapshotexample.yml similarity index 100% rename from testutils/yamltests/invalidsnapshotexample.yml rename to acl/testutils/yamltests/invalidsnapshotexample.yml diff --git a/testutils/yamltests/path.go b/acl/testutils/yamltests/path.go similarity index 100% rename from testutils/yamltests/path.go rename to acl/testutils/yamltests/path.go diff --git a/testutils/yamltests/userjoinexample.yml b/acl/testutils/yamltests/userjoinexample.yml similarity index 100% rename from testutils/yamltests/userjoinexample.yml rename to acl/testutils/yamltests/userjoinexample.yml diff --git a/testutils/yamltests/userjoinexampleupdate.yml b/acl/testutils/yamltests/userjoinexampleupdate.yml similarity index 100% rename from testutils/yamltests/userjoinexampleupdate.yml rename to acl/testutils/yamltests/userjoinexampleupdate.yml diff --git a/testutils/yamltests/userremovebeforeexample.yml b/acl/testutils/yamltests/userremovebeforeexample.yml similarity index 100% rename from testutils/yamltests/userremovebeforeexample.yml rename to acl/testutils/yamltests/userremovebeforeexample.yml diff --git a/testutils/yamltests/userremoveexample.yml b/acl/testutils/yamltests/userremoveexample.yml similarity index 100% rename from testutils/yamltests/userremoveexample.yml rename to acl/testutils/yamltests/userremoveexample.yml diff --git a/testutils/yamltests/validsnapshotexample.yml b/acl/testutils/yamltests/validsnapshotexample.yml similarity index 100% rename from testutils/yamltests/validsnapshotexample.yml rename to acl/testutils/yamltests/validsnapshotexample.yml diff --git a/thread/inmemory.go b/acl/thread/inmemory.go similarity index 96% rename from thread/inmemory.go rename to acl/thread/inmemory.go index 484428ee..8eaed188 100644 --- a/thread/inmemory.go +++ b/acl/thread/inmemory.go @@ -3,8 +3,8 @@ package thread import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/cid" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" "github.com/gogo/protobuf/proto" diff --git a/thread/models.go b/acl/thread/models.go similarity index 88% rename from thread/models.go rename to acl/thread/models.go index 7a10ff67..fe7411d6 100644 --- a/thread/models.go +++ b/acl/thread/models.go @@ -2,9 +2,8 @@ package thread import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/thread/pb" - - "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread/pb" ) // TODO: change methods to have errors as a return parameter, because we will be dealing with a real database diff --git a/thread/pb/protos/thread.proto b/acl/thread/pb/protos/thread.proto similarity index 100% rename from thread/pb/protos/thread.proto rename to acl/thread/pb/protos/thread.proto diff --git a/thread/pb/thread.pb.go b/acl/thread/pb/thread.pb.go similarity index 100% rename from thread/pb/thread.pb.go rename to acl/thread/pb/thread.pb.go diff --git a/thread/threadid.go b/acl/thread/threadid.go similarity index 100% rename from thread/threadid.go rename to acl/thread/threadid.go diff --git a/thread/threadid_test.go b/acl/thread/threadid_test.go similarity index 100% rename from thread/threadid_test.go rename to acl/thread/threadid_test.go