From 1379488e727cf10eae3de8b5ce02fd3f1842b0f5 Mon Sep 17 00:00:00 2001
From: whythat <whythat@protonmail.com>
Date: Thu, 14 Sep 2017 00:01:14 +0300
Subject: [PATCH] macaroons: rename PermissionsConstraint to AllowConstraint

---
 lnd.go                   | 2 +-
 macaroons/auth.go        | 2 +-
 macaroons/constraints.go | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lnd.go b/lnd.go
index dc51c2bb..2db3b76f 100644
--- a/lnd.go
+++ b/lnd.go
@@ -569,7 +569,7 @@ func genMacaroons(svc *bakery.Service, admFile, roFile string) error {
 
 	// Generate the read-only macaroon and write it to a file.
 	roMacaroon, err := macaroons.AddConstraints(admMacaroon,
-		macaroons.PermissionsConstraint(roPermissions...))
+		macaroons.AllowConstraint(roPermissions...))
 	if err != nil {
 		return err
 	}
diff --git a/macaroons/auth.go b/macaroons/auth.go
index 8a52e571..c616b014 100644
--- a/macaroons/auth.go
+++ b/macaroons/auth.go
@@ -97,7 +97,7 @@ func ValidateMacaroon(ctx context.Context, method string,
 	//
 	// TODO(aakselrod): Add more checks as required.
 	return svc.Check(macaroon.Slice{mac}, checkers.New(
-		PermissionsChecker(method),
+		AllowChecker(method),
 		TimeoutChecker(),
 		IPLockChecker(peerAddr),
 	))
diff --git a/macaroons/constraints.go b/macaroons/constraints.go
index c885ab4a..50a9a123 100644
--- a/macaroons/constraints.go
+++ b/macaroons/constraints.go
@@ -29,17 +29,17 @@ func AddConstraints(mac *macaroon.Macaroon, cs ...Constraint) (*macaroon.Macaroo
 // to the macaroon and adds another restriction to it. For each *Constraint,
 // the corresponding *Checker is provided.
 
-// PermissionsConstraint restricts allowed operations set to the ones
+// AllowConstraint restricts allowed operations set to the ones
 // passed to it.
-func PermissionsConstraint(ops ...string) func(*macaroon.Macaroon) error {
+func AllowConstraint(ops ...string) func(*macaroon.Macaroon) error {
 	return func(mac *macaroon.Macaroon) error {
 		caveat := checkers.AllowCaveat(ops...)
 		return mac.AddFirstPartyCaveat(caveat.Condition)
 	}
 }
 
-// PermissionsChecker wraps default checkers.OperationChecker.
-func PermissionsChecker(method string) checkers.Checker {
+// AllowChecker wraps default checkers.OperationChecker.
+func AllowChecker(method string) checkers.Checker {
 	return checkers.OperationChecker(method)
 }