macaroons: fix incorrect comparison in isRegistered, wrap long lines

This commit is contained in:
Oliver Gugger authored and Oliver Gugger committed 2018-05-18 10:14:06 +02:00
1 parent 3eff9804ee
commit f22b0ccdbc
3 files changed
+39 -26

No files matched your search

+4 -2
View File
@@ -97,7 +97,7 @@ func TestNewService(t *testing.T) {
// TestValidateMacaroon tests the validation of a macaroon that is in an
// incoming context.
func TestValidateMacaroon(t *testing.T) {
// First, initialize the service and unlock it
// First, initialize the service and unlock it.
tempDir := setupTestRootKeyStorage(t)
defer os.RemoveAll(tempDir)
service, err := macaroons.NewService(tempDir, macaroons.IPLockChecker)
@@ -123,7 +123,9 @@ func TestValidateMacaroon(t *testing.T) {
// Because the macaroons are always passed in a context, we need to
// mock one that has just the serialized macaroon as a value.
md := metadata.New(map[string]string{"macaroon": hex.EncodeToString(macaroonBinary)})
md := metadata.New(map[string]string{
"macaroon": hex.EncodeToString(macaroonBinary),
})
mockContext := metadata.NewIncomingContext(context.Background(), md)
// Finally, validate the macaroon against the required permissions.