From 1ace7ede0180615264ff2bdcabbdaf43f9bcb05d Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 30 Aug 2016 11:12:31 -0700 Subject: [PATCH] lnd: fix build for Go 1.6.3, refer to old context package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit fixes the build for version 1.6.3 of golang. In go 1.7, the “context” package was moved into the standard library, however go 1.6.3 doesn’t have that change, so we must refer to the prior WIP package until a new version of Go is released. --- lnd_test.go | 3 ++- networkharness.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lnd_test.go b/lnd_test.go index 94d98a1a..133bc78f 100644 --- a/lnd_test.go +++ b/lnd_test.go @@ -2,13 +2,14 @@ package main import ( "bytes" - "context" "fmt" "runtime/debug" "strings" "testing" "time" + "golang.org/x/net/context" + "github.com/lightningnetwork/lnd/lnrpc" "github.com/roasbeef/btcd/rpctest" "github.com/roasbeef/btcd/wire" diff --git a/networkharness.go b/networkharness.go index 758d3d73..23bed010 100644 --- a/networkharness.go +++ b/networkharness.go @@ -1,7 +1,6 @@ package main import ( - "context" "encoding/hex" "fmt" "io/ioutil" @@ -14,6 +13,8 @@ import ( "strconv" "time" + "golang.org/x/net/context" + "google.golang.org/grpc" "google.golang.org/grpc/grpclog"