From a22adc4a8e8049ec141ca5deaed60f5c8049ac6d Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 16:10:57 -0700 Subject: [PATCH] macaroons: stdlib context --- macaroons/auth.go | 3 +-- macaroons/constraints.go | 3 +-- macaroons/service.go | 3 +-- macaroons/store.go | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/macaroons/auth.go b/macaroons/auth.go index 64472a2c3..b8b5a8e8e 100644 --- a/macaroons/auth.go +++ b/macaroons/auth.go @@ -1,10 +1,9 @@ package macaroons import ( + "context" "encoding/hex" - "golang.org/x/net/context" - macaroon "gopkg.in/macaroon.v2" ) diff --git a/macaroons/constraints.go b/macaroons/constraints.go index f5277dd38..2ebea4252 100644 --- a/macaroons/constraints.go +++ b/macaroons/constraints.go @@ -1,6 +1,7 @@ package macaroons import ( + "context" "fmt" "net" "time" @@ -9,8 +10,6 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery/checkers" macaroon "gopkg.in/macaroon.v2" - - "golang.org/x/net/context" ) // Constraint type adds a layer of indirection over macaroon caveats. diff --git a/macaroons/service.go b/macaroons/service.go index 21134ace2..3dddea6be 100644 --- a/macaroons/service.go +++ b/macaroons/service.go @@ -1,6 +1,7 @@ package macaroons import ( + "context" "encoding/hex" "fmt" "os" @@ -13,8 +14,6 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery" "gopkg.in/macaroon-bakery.v2/bakery/checkers" macaroon "gopkg.in/macaroon.v2" - - "golang.org/x/net/context" ) var ( diff --git a/macaroons/store.go b/macaroons/store.go index ac766e5f5..7a38dd92e 100644 --- a/macaroons/store.go +++ b/macaroons/store.go @@ -1,12 +1,11 @@ package macaroons import ( + "context" "crypto/rand" "fmt" "io" - "golang.org/x/net/context" - "github.com/coreos/bbolt" "github.com/btcsuite/btcwallet/snacl"