macaroons: stdlib context

macaroons/auth.go

@@ -1,10 +1,9 @@
 package macaroons
 
 import (
+	"context"
 	"encoding/hex"
 
-	"golang.org/x/net/context"
-
 	macaroon "gopkg.in/macaroon.v2"
 )
 

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.

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 (

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"