diff options
| author | Felix Lange <fjl@twurst.com> | 2017-03-23 01:20:33 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-03-23 03:49:15 +0800 |
| commit | c213fd1fd8bb624241da7fc98cf25098d8b92761 (patch) | |
| tree | 7b109b0962b34d90d275a1dd1f64fbdba588bf9f /swarm | |
| parent | 525116dbff916825463931361f75e75e955c12e2 (diff) | |
| download | dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.gz dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.bz2 dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.lz dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.xz dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.tar.zst dexon-c213fd1fd8bb624241da7fc98cf25098d8b92761.zip | |
all: import "context" instead of "golang.org/x/net/context"
There is no need to depend on the old context package now that the
minimum Go version is 1.7. The move to "context" eliminates our weird
vendoring setup. Some vendored code still uses golang.org/x/net/context
and it is now vendored in the normal way.
This change triggered new vet checks around context.WithTimeout which
didn't fire with golang.org/x/net/context.
Diffstat (limited to 'swarm')
| -rw-r--r-- | swarm/services/swap/swap.go | 2 | ||||
| -rw-r--r-- | swarm/swarm.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/swarm/services/swap/swap.go b/swarm/services/swap/swap.go index eb21a598d..093892e8d 100644 --- a/swarm/services/swap/swap.go +++ b/swarm/services/swap/swap.go @@ -17,6 +17,7 @@ package swap import ( + "context" "crypto/ecdsa" "fmt" "math/big" @@ -33,7 +34,6 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/swarm/services/swap/swap" - "golang.org/x/net/context" ) // SwAP Swarm Accounting Protocol with diff --git a/swarm/swarm.go b/swarm/swarm.go index 44564a71d..bd256edaa 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -18,6 +18,7 @@ package swarm import ( "bytes" + "context" "crypto/ecdsa" "fmt" @@ -35,7 +36,6 @@ import ( httpapi "github.com/ethereum/go-ethereum/swarm/api/http" "github.com/ethereum/go-ethereum/swarm/network" "github.com/ethereum/go-ethereum/swarm/storage" - "golang.org/x/net/context" ) // the swarm stack |