From 085a63fee5dfac3c0f987292389fa0de056d538b Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 15:43:42 -0700 Subject: [PATCH 1/7] lntest: stdlib context --- lntest/harness.go | 2 +- lntest/itest/lnd_test.go | 2 +- lntest/node.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lntest/harness.go b/lntest/harness.go index f010c8298..841a43ca0 100644 --- a/lntest/harness.go +++ b/lntest/harness.go @@ -1,6 +1,7 @@ package lntest import ( + "context" "encoding/hex" "errors" "fmt" @@ -12,7 +13,6 @@ import ( "sync" "time" - "golang.org/x/net/context" "google.golang.org/grpc/grpclog" "github.com/btcsuite/btcd/chaincfg" diff --git a/lntest/itest/lnd_test.go b/lntest/itest/lnd_test.go index e7cdfcd82..de3391bbf 100644 --- a/lntest/itest/lnd_test.go +++ b/lntest/itest/lnd_test.go @@ -4,6 +4,7 @@ package itest import ( "bytes" + "context" "crypto/rand" "crypto/sha256" "encoding/hex" @@ -41,7 +42,6 @@ import ( "github.com/lightningnetwork/lnd/lntypes" "github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/routing" - "golang.org/x/net/context" ) var ( diff --git a/lntest/node.go b/lntest/node.go index 75a0d37fa..9b4256c3c 100644 --- a/lntest/node.go +++ b/lntest/node.go @@ -2,6 +2,7 @@ package lntest import ( "bytes" + "context" "encoding/hex" "flag" "fmt" @@ -29,7 +30,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc/wtclientrpc" "github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/macaroons" - "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "gopkg.in/macaroon.v2" From dade977d7bfea33c3772e640f8ec96a00b072942 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 15:44:45 -0700 Subject: [PATCH 2/7] cmd: stdlib context --- cmd/lncli/commands.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/lncli/commands.go b/cmd/lncli/commands.go index 79f15e338..c8dcfcd48 100644 --- a/cmd/lncli/commands.go +++ b/cmd/lncli/commands.go @@ -3,6 +3,7 @@ package main import ( "bufio" "bytes" + "context" "encoding/hex" "encoding/json" "errors" @@ -25,7 +26,6 @@ import ( "github.com/lightningnetwork/lnd/walletunlocker" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" - "golang.org/x/net/context" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) From bd2e4d6c426973fdbcfeb949dfe5a9ed92ea1f96 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 15:45:41 -0700 Subject: [PATCH 3/7] walletunlocker: stdlib context --- walletunlocker/service.go | 2 +- walletunlocker/service_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/walletunlocker/service.go b/walletunlocker/service.go index 3fe007cb5..a4e030e0a 100644 --- a/walletunlocker/service.go +++ b/walletunlocker/service.go @@ -1,6 +1,7 @@ package walletunlocker import ( + "context" "crypto/rand" "errors" "fmt" @@ -15,7 +16,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" - "golang.org/x/net/context" ) // ChannelsToRecover wraps any set of packed (serialized+encrypted) channel diff --git a/walletunlocker/service_test.go b/walletunlocker/service_test.go index 525a2bdca..8eec845a0 100644 --- a/walletunlocker/service_test.go +++ b/walletunlocker/service_test.go @@ -2,6 +2,7 @@ package walletunlocker_test import ( "bytes" + "context" "io/ioutil" "os" "strings" @@ -15,7 +16,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnwallet/btcwallet" "github.com/lightningnetwork/lnd/walletunlocker" - "golang.org/x/net/context" ) var ( From fa26359dd6ebb2b0f382ba56fb89795d2ce13e14 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 15:46:21 -0700 Subject: [PATCH 4/7] rpcserver: stdlib context --- rpcserver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcserver.go b/rpcserver.go index 51acda6c9..f2d87fff7 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -2,6 +2,7 @@ package lnd import ( "bytes" + "context" "crypto/tls" "encoding/hex" "errors" @@ -55,7 +56,6 @@ import ( "github.com/lightningnetwork/lnd/sweep" "github.com/lightningnetwork/lnd/zpay32" "github.com/tv42/zbase32" - "golang.org/x/net/context" "google.golang.org/grpc" "gopkg.in/macaroon-bakery.v2/bakery" ) From 8194d260ffe75ceb1516c5f62616851ca6eecc77 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 16:06:34 -0700 Subject: [PATCH 5/7] lnrpc: stdlib context --- lnrpc/routerrpc/router_backend.go | 2 +- lnrpc/walletrpc/walletkit_server.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lnrpc/routerrpc/router_backend.go b/lnrpc/routerrpc/router_backend.go index 2b0ada2ad..0148ad881 100644 --- a/lnrpc/routerrpc/router_backend.go +++ b/lnrpc/routerrpc/router_backend.go @@ -1,6 +1,7 @@ package routerrpc import ( + "context" "encoding/hex" "errors" "fmt" @@ -16,7 +17,6 @@ import ( "github.com/lightningnetwork/lnd/routing/route" "github.com/lightningnetwork/lnd/tlv" "github.com/lightningnetwork/lnd/zpay32" - context "golang.org/x/net/context" ) // RouterBackend contains the backend implementation of the router rpc sub diff --git a/lnrpc/walletrpc/walletkit_server.go b/lnrpc/walletrpc/walletkit_server.go index b463774ed..023782f62 100644 --- a/lnrpc/walletrpc/walletkit_server.go +++ b/lnrpc/walletrpc/walletkit_server.go @@ -4,6 +4,7 @@ package walletrpc import ( "bytes" + "context" "errors" "fmt" "io/ioutil" @@ -19,7 +20,6 @@ import ( "github.com/lightningnetwork/lnd/lnrpc/signrpc" "github.com/lightningnetwork/lnd/lnwallet" "github.com/lightningnetwork/lnd/sweep" - "golang.org/x/net/context" "google.golang.org/grpc" "gopkg.in/macaroon-bakery.v2/bakery" ) From 259b5b253d7ed14568a21947a0f8373e00c5b767 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 16:07:37 -0700 Subject: [PATCH 6/7] lnd: stdlib context --- lnd.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lnd.go b/lnd.go index 0d5ab7f11..9bf0426d8 100644 --- a/lnd.go +++ b/lnd.go @@ -6,6 +6,7 @@ package lnd import ( "bytes" + "context" "crypto/ecdsa" "crypto/elliptic" "crypto/rand" @@ -30,8 +31,6 @@ import ( "gopkg.in/macaroon-bakery.v2/bakery" - "golang.org/x/net/context" - "google.golang.org/grpc" "google.golang.org/grpc/credentials" From a22adc4a8e8049ec141ca5deaed60f5c8049ac6d Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Sat, 28 Sep 2019 16:10:57 -0700 Subject: [PATCH 7/7] 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"