diff --git a/README.md b/README.md index a70c24fa..5f88ce74 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,12 @@ # go-anytype-infrastructure-experiments This repository will have the code for new infrastructure client and node prototypes + +## Project structure +- **app** - DI, loggers, common engine +- **bin** - contains compiled binaries (under gitignore) +- **cmd** - main files by directories +- **config** - config component +- **etc** - default/example config files, keys, etc +- **service** - services, runtime components (these packages can use code from everywhere) +- **pkg** - some static packages that can be able to move to a separate repo, dependencies of these packages limited to this folder (maybe util) +- **util** - helpers \ No newline at end of file diff --git a/bin/anytype-node b/bin/anytype-node index c03f9d05..378a2f0a 100755 Binary files a/bin/anytype-node and b/bin/anytype-node differ diff --git a/cmd/node/node.go b/cmd/node/node.go index be6d8c3c..089f20a9 100644 --- a/cmd/node/node.go +++ b/cmd/node/node.go @@ -34,34 +34,42 @@ func main() { return } + // create app ctx := context.Background() a := new(app.App) + // open config file conf, err := config.NewFromFile(*flagConfigFile) if err != nil { log.Fatal("can't open config file", zap.Error(err)) } + // bootstrap components a.Register(conf) - Bootstrap(a) + + // start app if err := a.Start(ctx); err != nil { log.Error("can't start app", zap.Error(err)) } log.Info("app started", zap.String("version", a.Version())) + // wait exit signal exit := make(chan os.Signal, 1) signal.Notify(exit, os.Interrupt, syscall.SIGKILL, syscall.SIGTERM, syscall.SIGQUIT) sig := <-exit - log.Info("received exit signal, stop app", zap.String("signal", fmt.Sprint(sig))) + log.Info("received exit signal, stop app...", zap.String("signal", fmt.Sprint(sig))) + // close app ctx, cancel := context.WithTimeout(ctx, time.Minute) defer cancel() if err := a.Close(ctx); err != nil { log.Fatal("close error", zap.Error(err)) + } else { + log.Info("goodbye!") } } func Bootstrap(a *app.App) { - + //a.Register(mycomponent.New()) } diff --git a/acl/account/accountdata.go b/pkg/acl/account/accountdata.go similarity index 100% rename from acl/account/accountdata.go rename to pkg/acl/account/accountdata.go diff --git a/acl/aclchanges/change.go b/pkg/acl/aclchanges/change.go similarity index 64% rename from acl/aclchanges/change.go rename to pkg/acl/aclchanges/change.go index 9e63f1fc..38099d58 100644 --- a/acl/aclchanges/change.go +++ b/pkg/acl/aclchanges/change.go @@ -1,7 +1,7 @@ package aclchanges import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" ) type Change interface { diff --git a/acl/aclchanges/pb/aclchanges.pb.go b/pkg/acl/aclchanges/pb/aclchanges.pb.go similarity index 100% rename from acl/aclchanges/pb/aclchanges.pb.go rename to pkg/acl/aclchanges/pb/aclchanges.pb.go diff --git a/acl/aclchanges/pb/protos/aclchanges.proto b/pkg/acl/aclchanges/pb/protos/aclchanges.proto similarity index 100% rename from acl/aclchanges/pb/protos/aclchanges.proto rename to pkg/acl/aclchanges/pb/protos/aclchanges.proto diff --git a/acl/acltree/aclstate.go b/pkg/acl/acltree/aclstate.go similarity index 99% rename from acl/acltree/aclstate.go rename to pkg/acl/acltree/aclstate.go index 066ea869..a7ed5a0d 100644 --- a/acl/acltree/aclstate.go +++ b/pkg/acl/acltree/aclstate.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/textileio/go-threads/crypto/symmetric" "hash/fnv" diff --git a/acl/acltree/aclstatebuilder.go b/pkg/acl/acltree/aclstatebuilder.go similarity index 96% rename from acl/acltree/aclstatebuilder.go rename to pkg/acl/acltree/aclstatebuilder.go index 537c5fff..d085f269 100644 --- a/acl/acltree/aclstatebuilder.go +++ b/pkg/acl/acltree/aclstatebuilder.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/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acl/acltree/acltree.go b/pkg/acl/acltree/acltree.go similarity index 97% rename from acl/acltree/acltree.go rename to pkg/acl/acltree/acltree.go index 737c134c..fdde9c0c 100644 --- a/acl/acltree/acltree.go +++ b/pkg/acl/acltree/acltree.go @@ -1,8 +1,8 @@ package acltree import ( - "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/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "sync" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" diff --git a/acl/acltree/acltree_test.go b/pkg/acl/acltree/acltree_test.go similarity index 97% rename from acl/acltree/acltree_test.go rename to pkg/acl/acltree/acltree_test.go index b474db73..19f3f450 100644 --- a/acl/acltree/acltree_test.go +++ b/pkg/acl/acltree/acltree_test.go @@ -1,9 +1,9 @@ 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" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/threadbuilder" "testing" "github.com/stretchr/testify/assert" diff --git a/acl/acltree/acltreebuilder.go b/pkg/acl/acltree/acltreebuilder.go similarity index 97% rename from acl/acltree/acltreebuilder.go rename to pkg/acl/acltree/acltreebuilder.go index b9cc1456..e1f3a8a4 100644 --- a/acl/acltree/acltreebuilder.go +++ b/pkg/acl/acltree/acltreebuilder.go @@ -2,7 +2,7 @@ package acltree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" diff --git a/acl/acltree/change.go b/pkg/acl/acltree/change.go similarity index 93% rename from acl/acltree/change.go rename to pkg/acl/acltree/change.go index 5d491ce0..ba34b032 100644 --- a/acl/acltree/change.go +++ b/pkg/acl/acltree/change.go @@ -2,8 +2,8 @@ package acltree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/gogo/protobuf/proto" "github.com/textileio/go-threads/crypto/symmetric" diff --git a/acl/acltree/changebuilder.go b/pkg/acl/acltree/changebuilder.go similarity index 96% rename from acl/acltree/changebuilder.go rename to pkg/acl/acltree/changebuilder.go index 676ed477..088a2d7a 100644 --- a/acl/acltree/changebuilder.go +++ b/pkg/acl/acltree/changebuilder.go @@ -1,8 +1,8 @@ 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/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/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/acl/acltree/changeloader.go b/pkg/acl/acltree/changeloader.go similarity index 93% rename from acl/acltree/changeloader.go rename to pkg/acl/acltree/changeloader.go index f227f8ce..c0b2699d 100644 --- a/acl/acltree/changeloader.go +++ b/pkg/acl/acltree/changeloader.go @@ -3,8 +3,8 @@ package acltree import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/aclchanges/pb" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "time" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" diff --git a/acl/acltree/snapshotvalidator.go b/pkg/acl/acltree/snapshotvalidator.go similarity index 93% rename from acl/acltree/snapshotvalidator.go rename to pkg/acl/acltree/snapshotvalidator.go index 627a9e9d..a478e0f0 100644 --- a/acl/acltree/snapshotvalidator.go +++ b/pkg/acl/acltree/snapshotvalidator.go @@ -2,7 +2,7 @@ package acltree import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/account" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acl/acltree/threadutility.go b/pkg/acl/acltree/threadutility.go similarity index 84% rename from acl/acltree/threadutility.go rename to pkg/acl/acltree/threadutility.go index a9c7b98e..4b4a03e4 100644 --- a/acl/acltree/threadutility.go +++ b/pkg/acl/acltree/threadutility.go @@ -1,8 +1,8 @@ package acltree import ( - "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/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" ) diff --git a/acl/acltree/threadutility_test.go b/pkg/acl/acltree/threadutility_test.go similarity index 78% rename from acl/acltree/threadutility_test.go rename to pkg/acl/acltree/threadutility_test.go index 53cef313..92128dca 100644 --- a/acl/acltree/threadutility_test.go +++ b/pkg/acl/acltree/threadutility_test.go @@ -2,10 +2,10 @@ package acltree import ( "context" - "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/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/threadbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/stretchr/testify/assert" "testing" ) diff --git a/acl/acltree/tree.go b/pkg/acl/acltree/tree.go similarity index 100% rename from acl/acltree/tree.go rename to pkg/acl/acltree/tree.go diff --git a/acl/acltree/treebuilder.go b/pkg/acl/acltree/treebuilder.go similarity index 98% rename from acl/acltree/treebuilder.go rename to pkg/acl/acltree/treebuilder.go index 65a36072..0e0dbea7 100644 --- a/acl/acltree/treebuilder.go +++ b/pkg/acl/acltree/treebuilder.go @@ -3,7 +3,7 @@ package acltree import ( "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/thread" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/keys" //"github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/lib/logging" diff --git a/acl/acltree/treebuilder_test.go b/pkg/acl/acltree/treebuilder_test.go similarity index 100% rename from acl/acltree/treebuilder_test.go rename to pkg/acl/acltree/treebuilder_test.go diff --git a/acl/acltree/treegraph.go b/pkg/acl/acltree/treegraph.go similarity index 100% rename from acl/acltree/treegraph.go rename to pkg/acl/acltree/treegraph.go diff --git a/acl/acltree/treegraph_nix.go b/pkg/acl/acltree/treegraph_nix.go similarity index 100% rename from acl/acltree/treegraph_nix.go rename to pkg/acl/acltree/treegraph_nix.go diff --git a/acl/acltree/treeiterator.go b/pkg/acl/acltree/treeiterator.go similarity index 100% rename from acl/acltree/treeiterator.go rename to pkg/acl/acltree/treeiterator.go diff --git a/acl/plaintextdocument/document.go b/pkg/acl/plaintextdocument/document.go similarity index 74% rename from acl/plaintextdocument/document.go rename to pkg/acl/plaintextdocument/document.go index 0bb1b514..1fdc2cfe 100644 --- a/acl/plaintextdocument/document.go +++ b/pkg/acl/plaintextdocument/document.go @@ -2,11 +2,11 @@ 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/pkg/acl/account" + aclpb "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/acltree" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/testchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/gogo/protobuf/proto" ) @@ -18,7 +18,7 @@ type PlainTextDocument interface { type plainTextDocument struct { heads []string - aclTree acltree2.ACLTree + aclTree acltree.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 acltree2.ChangeBuilder) error { + _, err := p.aclTree.AddContent(func(builder acltree.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 acltree2.ACLTree) { +func (p *plainTextDocument) Update(tree acltree.ACLTree) { p.aclTree = tree var err error defer func() { @@ -54,7 +54,7 @@ func (p *plainTextDocument) Update(tree acltree2.ACLTree) { prevHeads := p.heads p.heads = tree.Heads() startId := prevHeads[0] - tree.IterateFrom(startId, func(change *acltree2.Change) (isContinue bool) { + tree.IterateFrom(startId, func(change *acltree.Change) (isContinue bool) { if change.Id == startId { return true } @@ -68,7 +68,7 @@ func (p *plainTextDocument) Update(tree acltree2.ACLTree) { }) } -func (p *plainTextDocument) Rebuild(tree acltree2.ACLTree) { +func (p *plainTextDocument) Rebuild(tree acltree.ACLTree) { p.aclTree = tree p.heads = tree.Heads() var startId string @@ -92,7 +92,7 @@ func (p *plainTextDocument) Rebuild(tree acltree2.ACLTree) { } startId = rootChange.Id - tree.Iterate(func(change *acltree2.Change) (isContinue bool) { + tree.Iterate(func(change *acltree.Change) (isContinue bool) { if startId == change.Id { return true } @@ -111,14 +111,14 @@ func (p *plainTextDocument) Rebuild(tree acltree2.ACLTree) { } func NewInMemoryPlainTextDocument(acc *account.AccountData, text string) (PlainTextDocument, error) { - return NewPlainTextDocument(acc, thread2.NewInMemoryThread, text) + return NewPlainTextDocument(acc, thread.NewInMemoryThread, text) } func NewPlainTextDocument( acc *account.AccountData, - create func(change *thread2.RawChange) (thread2.Thread, error), + create func(change *thread.RawChange) (thread.Thread, error), text string) (PlainTextDocument, error) { - changeBuilder := func(builder acltree2.ChangeBuilder) error { + changeBuilder := func(builder acltree.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 := acltree2.BuildThreadWithACL( + t, err := acltree.BuildThreadWithACL( acc, changeBuilder, create) @@ -139,7 +139,7 @@ func NewPlainTextDocument( aclTree: nil, state: nil, } - tree, err := acltree2.BuildACLTree(t, acc, doc) + tree, err := acltree.BuildACLTree(t, acc, doc) if err != nil { return nil, err } diff --git a/acl/plaintextdocument/document_test.go b/pkg/acl/plaintextdocument/document_test.go similarity index 84% rename from acl/plaintextdocument/document_test.go rename to pkg/acl/plaintextdocument/document_test.go index 31f8e365..8b6e0a13 100644 --- a/acl/plaintextdocument/document_test.go +++ b/pkg/acl/plaintextdocument/document_test.go @@ -1,9 +1,9 @@ package plaintextdocument import ( - "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/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/account" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/threadbuilder" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" "github.com/stretchr/testify/assert" "testing" ) diff --git a/acl/plaintextdocument/plaintextdocstate.go b/pkg/acl/plaintextdocument/plaintextdocstate.go similarity index 93% rename from acl/plaintextdocument/plaintextdocstate.go rename to pkg/acl/plaintextdocument/plaintextdocstate.go index aed89c28..9997af83 100644 --- a/acl/plaintextdocument/plaintextdocstate.go +++ b/pkg/acl/plaintextdocument/plaintextdocstate.go @@ -2,7 +2,7 @@ package plaintextdocument import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/testchanges/pb" "github.com/gogo/protobuf/proto" ) diff --git a/acl/testutils/testchanges/pb/protos/testdocumentchanges.proto b/pkg/acl/testutils/testchanges/pb/protos/testdocumentchanges.proto similarity index 100% rename from acl/testutils/testchanges/pb/protos/testdocumentchanges.proto rename to pkg/acl/testutils/testchanges/pb/protos/testdocumentchanges.proto diff --git a/acl/testutils/testchanges/pb/testdocumentchanges.pb.go b/pkg/acl/testutils/testchanges/pb/testdocumentchanges.pb.go similarity index 100% rename from acl/testutils/testchanges/pb/testdocumentchanges.pb.go rename to pkg/acl/testutils/testchanges/pb/testdocumentchanges.pb.go diff --git a/acl/testutils/threadbuilder/keychain.go b/pkg/acl/testutils/threadbuilder/keychain.go similarity index 100% rename from acl/testutils/threadbuilder/keychain.go rename to pkg/acl/testutils/threadbuilder/keychain.go diff --git a/acl/testutils/threadbuilder/threadbuilder.go b/pkg/acl/testutils/threadbuilder/threadbuilder.go similarity index 95% rename from acl/testutils/threadbuilder/threadbuilder.go rename to pkg/acl/testutils/threadbuilder/threadbuilder.go index 0dd68e25..11121251 100644 --- a/acl/testutils/threadbuilder/threadbuilder.go +++ b/pkg/acl/testutils/threadbuilder/threadbuilder.go @@ -3,12 +3,12 @@ package threadbuilder import ( "context" "fmt" - "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/pkg/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/aclchanges/pb" + testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/testchanges/pb" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/yamltests" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread" + threadpb "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/thread/pb" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" "io/ioutil" "path" @@ -87,7 +87,7 @@ func (t *ThreadBuilder) Heads() []string { return t.heads } -func (t *ThreadBuilder) AddRawChange(change *thread2.RawChange) error { +func (t *ThreadBuilder) AddRawChange(change *thread.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) (*thread2.RawChange, error) { +func (t *ThreadBuilder) GetChange(ctx context.Context, recordID string) (*thread.RawChange, error) { return t.getChange(recordID, t.allChanges), nil } -func (t *ThreadBuilder) GetUpdates(useCase string) []*thread2.RawChange { - var res []*thread2.RawChange +func (t *ThreadBuilder) GetUpdates(useCase string) []*thread.RawChange { + var res []*thread.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) *thread2.RawChange { +func (t *ThreadBuilder) getChange(changeId string, m map[string]*threadChange) *thread.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 := &thread2.RawChange{ + transformedRec := &thread.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 := thread2.CreateACLThreadID(key.GetPublic(), plainTextDocType) + id, err := thread.CreateACLThreadID(key.GetPublic(), plainTextDocType) if err != nil { panic(err) } diff --git a/acl/testutils/threadbuilder/threadbuildergraph.go b/pkg/acl/testutils/threadbuilder/threadbuildergraph.go similarity index 100% rename from acl/testutils/threadbuilder/threadbuildergraph.go rename to pkg/acl/testutils/threadbuilder/threadbuildergraph.go diff --git a/acl/testutils/threadbuilder/threadbuildergraph_nix.go b/pkg/acl/testutils/threadbuilder/threadbuildergraph_nix.go similarity index 98% rename from acl/testutils/threadbuilder/threadbuildergraph_nix.go rename to pkg/acl/testutils/threadbuilder/threadbuildergraph_nix.go index af56f17e..2abf3cc9 100644 --- a/acl/testutils/threadbuilder/threadbuildergraph_nix.go +++ b/pkg/acl/testutils/threadbuilder/threadbuildergraph_nix.go @@ -9,7 +9,7 @@ package threadbuilder import ( "fmt" - testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/acl/testutils/testchanges/pb" + testpb "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/acl/testutils/testchanges/pb" "github.com/gogo/protobuf/proto" "strings" diff --git a/acl/testutils/threadbuilder/ymlentities.go b/pkg/acl/testutils/threadbuilder/ymlentities.go similarity index 100% rename from acl/testutils/threadbuilder/ymlentities.go rename to pkg/acl/testutils/threadbuilder/ymlentities.go diff --git a/acl/testutils/threadbuilder/ymlentities_test.go b/pkg/acl/testutils/threadbuilder/ymlentities_test.go similarity index 100% rename from acl/testutils/threadbuilder/ymlentities_test.go rename to pkg/acl/testutils/threadbuilder/ymlentities_test.go diff --git a/acl/testutils/yamltests/invalidsnapshotexample.yml b/pkg/acl/testutils/yamltests/invalidsnapshotexample.yml similarity index 100% rename from acl/testutils/yamltests/invalidsnapshotexample.yml rename to pkg/acl/testutils/yamltests/invalidsnapshotexample.yml diff --git a/acl/testutils/yamltests/path.go b/pkg/acl/testutils/yamltests/path.go similarity index 100% rename from acl/testutils/yamltests/path.go rename to pkg/acl/testutils/yamltests/path.go diff --git a/acl/testutils/yamltests/userjoinexample.yml b/pkg/acl/testutils/yamltests/userjoinexample.yml similarity index 100% rename from acl/testutils/yamltests/userjoinexample.yml rename to pkg/acl/testutils/yamltests/userjoinexample.yml diff --git a/acl/testutils/yamltests/userjoinexampleupdate.yml b/pkg/acl/testutils/yamltests/userjoinexampleupdate.yml similarity index 100% rename from acl/testutils/yamltests/userjoinexampleupdate.yml rename to pkg/acl/testutils/yamltests/userjoinexampleupdate.yml diff --git a/acl/testutils/yamltests/userremovebeforeexample.yml b/pkg/acl/testutils/yamltests/userremovebeforeexample.yml similarity index 100% rename from acl/testutils/yamltests/userremovebeforeexample.yml rename to pkg/acl/testutils/yamltests/userremovebeforeexample.yml diff --git a/acl/testutils/yamltests/userremoveexample.yml b/pkg/acl/testutils/yamltests/userremoveexample.yml similarity index 100% rename from acl/testutils/yamltests/userremoveexample.yml rename to pkg/acl/testutils/yamltests/userremoveexample.yml diff --git a/acl/testutils/yamltests/validsnapshotexample.yml b/pkg/acl/testutils/yamltests/validsnapshotexample.yml similarity index 100% rename from acl/testutils/yamltests/validsnapshotexample.yml rename to pkg/acl/testutils/yamltests/validsnapshotexample.yml diff --git a/acl/thread/inmemory.go b/pkg/acl/thread/inmemory.go similarity index 94% rename from acl/thread/inmemory.go rename to pkg/acl/thread/inmemory.go index 8eaed188..a1f7e546 100644 --- a/acl/thread/inmemory.go +++ b/pkg/acl/thread/inmemory.go @@ -3,8 +3,8 @@ package thread import ( "context" "fmt" - "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/pkg/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/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/acl/thread/models.go b/pkg/acl/thread/models.go similarity index 79% rename from acl/thread/models.go rename to pkg/acl/thread/models.go index fe7411d6..ec8ae691 100644 --- a/acl/thread/models.go +++ b/pkg/acl/thread/models.go @@ -2,8 +2,8 @@ package thread import ( "context" - "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/pkg/acl/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/pkg/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/acl/thread/pb/protos/thread.proto b/pkg/acl/thread/pb/protos/thread.proto similarity index 100% rename from acl/thread/pb/protos/thread.proto rename to pkg/acl/thread/pb/protos/thread.proto diff --git a/acl/thread/pb/thread.pb.go b/pkg/acl/thread/pb/thread.pb.go similarity index 100% rename from acl/thread/pb/thread.pb.go rename to pkg/acl/thread/pb/thread.pb.go diff --git a/acl/thread/threadid.go b/pkg/acl/thread/threadid.go similarity index 100% rename from acl/thread/threadid.go rename to pkg/acl/thread/threadid.go diff --git a/acl/thread/threadid_test.go b/pkg/acl/thread/threadid_test.go similarity index 100% rename from acl/thread/threadid_test.go rename to pkg/acl/thread/threadid_test.go