macaroons: stdlib context

This commit is contained in:
Lars Lehtonen 2019-09-28 16:10:57 -07:00
parent 259b5b253d
commit a22adc4a8e
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
4 changed files with 4 additions and 8 deletions

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

@ -1,6 +1,7 @@
package macaroons package macaroons
import ( import (
"context"
"fmt" "fmt"
"net" "net"
"time" "time"
@ -9,8 +10,6 @@ import (
"gopkg.in/macaroon-bakery.v2/bakery/checkers" "gopkg.in/macaroon-bakery.v2/bakery/checkers"
macaroon "gopkg.in/macaroon.v2" macaroon "gopkg.in/macaroon.v2"
"golang.org/x/net/context"
) )
// Constraint type adds a layer of indirection over macaroon caveats. // Constraint type adds a layer of indirection over macaroon caveats.

@ -1,6 +1,7 @@
package macaroons package macaroons
import ( import (
"context"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"os" "os"
@ -13,8 +14,6 @@ import (
"gopkg.in/macaroon-bakery.v2/bakery" "gopkg.in/macaroon-bakery.v2/bakery"
"gopkg.in/macaroon-bakery.v2/bakery/checkers" "gopkg.in/macaroon-bakery.v2/bakery/checkers"
macaroon "gopkg.in/macaroon.v2" macaroon "gopkg.in/macaroon.v2"
"golang.org/x/net/context"
) )
var ( var (

@ -1,12 +1,11 @@
package macaroons package macaroons
import ( import (
"context"
"crypto/rand" "crypto/rand"
"fmt" "fmt"
"io" "io"
"golang.org/x/net/context"
"github.com/coreos/bbolt" "github.com/coreos/bbolt"
"github.com/btcsuite/btcwallet/snacl" "github.com/btcsuite/btcwallet/snacl"