PR(ACP): Remove ACPModule from client.Store

shahzadlone · Mar 14, 2024 · 0c63d72 · 0c63d72
1 parent c83c90b
commit 0c63d72
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 58 deletions.
diff --git a/client/db.go b/client/db.go
@@ -17,7 +17,6 @@ import (
 	"github.com/lens-vm/lens/host-go/config/model"
 	"github.com/sourcenetwork/immutable"
 
-	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/events"
 )
@@ -223,10 +222,6 @@ type Store interface {
 		request string,
 	) *RequestResult
 
-	// ACPModule returns the underlying acp module (optional). Incase the access control
-	// is turned off, then the returned acp module will have no value (will be empty).
-	ACPModule(context.Context) (immutable.Option[acp.ACPModule], error)
-
 	// AddPolicy attempts to add policy if the acp module exists, otherwise returns an error.
 	AddPolicy(context.Context, string, string) (AddPolicyResult, error)
 }

diff --git a/db/collection_update.go b/db/collection_update.go
@@ -438,6 +438,7 @@ func (c *collection) makeSelectionPlan(
 	planner := planner.New(
 		ctx,
 		identity,
+		c.db.acp,
 		c.db.WithTxn(txn),
 		txn,
 	)

diff --git a/db/request.go b/db/request.go
@@ -55,7 +55,13 @@ func (db *db) execRequest(
 		return res
 	}
 
-	planner := planner.New(ctx, identity, db.WithTxn(txn), txn)
+	planner := planner.New(
+		ctx,
+		identity,
+		db.acp,
+		db.WithTxn(txn),
+		txn,
+	)
 
 	results, err := planner.RunRequest(ctx, parsedRequest)
 	if err != nil {

diff --git a/db/subscriptions.go b/db/subscriptions.go
@@ -76,7 +76,13 @@ func (db *db) handleEvent(
 	evt events.Update,
 	r *request.ObjectSubscription,
 ) {
-	p := planner.New(ctx, identity, db.WithTxn(txn), txn)
+	p := planner.New(
+		ctx,
+		identity,
+		db.acp,
+		db.WithTxn(txn),
+		txn,
+	)
 
 	s := r.ToSelect(evt.DocID, evt.Cid.String())
 

diff --git a/db/txn_db.go b/db/txn_db.go
@@ -17,7 +17,6 @@ import (
 
 	"github.com/sourcenetwork/immutable"
 
-	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/datastore"
 )
@@ -403,20 +402,6 @@ func (db *explicitTxnDB) LensRegistry() client.LensRegistry {
 	return db.lensRegistry
 }
 
-func (db *implicitTxnDB) ACPModule(ctx context.Context) (immutable.Option[acp.ACPModule], error) {
-	txn, err := db.NewTxn(ctx, true)
-	if err != nil {
-		return acp.NoACPModule, err
-	}
-	defer txn.Discard(ctx)
-
-	return db.acp, txn.Commit(ctx)
-}
-
-func (db *explicitTxnDB) ACPModule(ctx context.Context) (immutable.Option[acp.ACPModule], error) {
-	return db.acp, nil
-}
-
 func (db *implicitTxnDB) AddPolicy(
 	ctx context.Context,
 	creator string,
@@ -428,16 +413,11 @@ func (db *implicitTxnDB) AddPolicy(
 	}
 	defer txn.Discard(ctx)
 
-	acpModule, err := db.ACPModule(ctx)
-	if err != nil {
-		return client.AddPolicyResult{}, err
-	}
-
-	if !acpModule.HasValue() {
+	if !db.acp.HasValue() {
 		return client.AddPolicyResult{}, client.ErrPolicyAddFailureACPModuleNotFound
 	}
 
-	policyID, err := acpModule.Value().AddPolicy(
+	policyID, err := db.acp.Value().AddPolicy(
 		ctx,
 		creator,
 		policy,
@@ -455,16 +435,11 @@ func (db *explicitTxnDB) AddPolicy(
 	creator string,
 	policy string,
 ) (client.AddPolicyResult, error) {
-	acpModule, err := db.ACPModule(ctx)
-	if err != nil {
-		return client.AddPolicyResult{}, err
-	}
-
-	if !acpModule.HasValue() {
+	if !db.acp.HasValue() {
 		return client.AddPolicyResult{}, client.ErrPolicyAddFailureACPModuleNotFound
 	}
 
-	policyID, err := acpModule.Value().AddPolicy(
+	policyID, err := db.acp.Value().AddPolicy(
 		ctx,
 		creator,
 		policy,

diff --git a/http/client.go b/http/client.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/sourcenetwork/immutable"
 
-	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/events"
@@ -434,10 +433,6 @@ func (c *Client) Peerstore() datastore.DSBatching {
 	panic("client side database")
 }
 
-func (c *Client) ACPModule(ctx context.Context) (immutable.Option[acp.ACPModule], error) {
-	panic("client side database")
-}
-
 func (c *Client) Events() events.Events {
 	panic("client side database")
 }

diff --git a/planner/planner.go b/planner/planner.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/sourcenetwork/immutable"
 
+	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/client/request"
 	"github.com/sourcenetwork/defradb/connor"
@@ -86,6 +87,7 @@ type PlanContext struct {
 type Planner struct {
 	txn      datastore.Txn
 	identity immutable.Option[string]
+	acp      immutable.Option[acp.ACPModule]
 	db       client.Store
 
 	ctx context.Context
@@ -94,12 +96,14 @@ type Planner struct {
 func New(
 	ctx context.Context,
 	identity immutable.Option[string],
+	acp immutable.Option[acp.ACPModule],
 	db client.Store,
 	txn datastore.Txn,
 ) *Planner {
 	return &Planner{
 		txn:      txn,
 		identity: identity,
+		acp:      acp,
 		db:       db,
 		ctx:      ctx,
 	}

diff --git a/planner/scan.go b/planner/scan.go
@@ -61,17 +61,12 @@ func (n *scanNode) Kind() string {
 }
 
 func (n *scanNode) Init() error {
-	acpModule, err := n.p.db.ACPModule(n.p.ctx)
-	if err != nil {
-		return err
-	}
-
 	// init the fetcher
 	if err := n.fetcher.Init(
 		n.p.ctx,
 		n.p.identity,
 		n.p.txn,
-		acpModule,
+		n.p.acp,
 		n.col,
 		n.fields,
 		n.filter,

diff --git a/tests/bench/query/planner/utils.go b/tests/bench/query/planner/utils.go
@@ -15,6 +15,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/sourcenetwork/defradb/acp"
 	acpIdentity "github.com/sourcenetwork/defradb/acp/identity"
 	"github.com/sourcenetwork/defradb/core"
 	"github.com/sourcenetwork/defradb/datastore"
@@ -79,7 +80,13 @@ func runMakePlanBench(
 
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		planner := planner.New(ctx, acpIdentity.NoIdentity, db.WithTxn(txn), txn)
+		planner := planner.New(
+			ctx,
+			acpIdentity.NoIdentity,
+			acp.NoACPModule,
+			db.WithTxn(txn),
+			txn,
+		)
 		plan, err := planner.MakePlan(q)
 		if err != nil {
 			return errors.Wrap("failed to make plan", err)

diff --git a/tests/clients/cli/wrapper.go b/tests/clients/cli/wrapper.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/sourcenetwork/immutable"
 
-	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/cli"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/datastore"
@@ -503,10 +502,6 @@ func (w *Wrapper) Peerstore() datastore.DSBatching {
 	return w.node.Peerstore()
 }
 
-func (w *Wrapper) ACPModule(ctx context.Context) (immutable.Option[acp.ACPModule], error) {
-	return w.node.ACPModule(ctx)
-}
-
 func (w *Wrapper) AddPolicy(
 	ctx context.Context,
 	creator string,

diff --git a/tests/clients/http/wrapper.go b/tests/clients/http/wrapper.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/sourcenetwork/immutable"
 
-	"github.com/sourcenetwork/defradb/acp"
 	"github.com/sourcenetwork/defradb/client"
 	"github.com/sourcenetwork/defradb/datastore"
 	"github.com/sourcenetwork/defradb/events"
@@ -203,10 +202,6 @@ func (w *Wrapper) Peerstore() datastore.DSBatching {
 	return w.node.Peerstore()
 }
 
-func (w *Wrapper) ACPModule(ctx context.Context) (immutable.Option[acp.ACPModule], error) {
-	return w.node.ACPModule(ctx)
-}
-
 func (w *Wrapper) AddPolicy(
 	ctx context.Context,
 	creator string,