mirror of https://github.com/ethereum/go-ethereum
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.pull/3809/head
Felix Lange
8 years ago
parent
525116dbff
commit
c213fd1fd8
@ -1,27 +0,0 @@ |
||||
Copyright (c) 2009 The Go Authors. All rights reserved. |
||||
|
||||
Redistribution and use in source and binary forms, with or without |
||||
modification, are permitted provided that the following conditions are |
||||
met: |
||||
|
||||
* Redistributions of source code must retain the above copyright |
||||
notice, this list of conditions and the following disclaimer. |
||||
* Redistributions in binary form must reproduce the above |
||||
copyright notice, this list of conditions and the following disclaimer |
||||
in the documentation and/or other materials provided with the |
||||
distribution. |
||||
* Neither the name of Google Inc. nor the names of its |
||||
contributors may be used to endorse or promote products derived from |
||||
this software without specific prior written permission. |
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
@ -1,60 +0,0 @@ |
||||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// +build !go1.5
|
||||
|
||||
package rpc |
||||
|
||||
import ( |
||||
"net" |
||||
"net/http" |
||||
"time" |
||||
|
||||
"golang.org/x/net/context" |
||||
) |
||||
|
||||
// In older versions of Go (below 1.5), dials cannot be canceled
|
||||
// via a channel or context. The context deadline can still applied.
|
||||
|
||||
// contextDialer returns a dialer that applies the deadline value from the given context.
|
||||
func contextDialer(ctx context.Context) *net.Dialer { |
||||
dialer := &net.Dialer{KeepAlive: tcpKeepAliveInterval} |
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
dialer.Deadline = deadline |
||||
} else { |
||||
dialer.Deadline = time.Now().Add(defaultDialTimeout) |
||||
} |
||||
return dialer |
||||
} |
||||
|
||||
// dialContext connects to the given address, aborting the dial if ctx is canceled.
|
||||
func dialContext(ctx context.Context, network, addr string) (net.Conn, error) { |
||||
return contextDialer(ctx).Dial(network, addr) |
||||
} |
||||
|
||||
// requestWithContext copies req, adding the cancelation channel and deadline from ctx.
|
||||
func requestWithContext(c *http.Client, req *http.Request, ctx context.Context) (*http.Client, *http.Request) { |
||||
// Set Timeout on the client if the context has a deadline.
|
||||
// Note that there is no default timeout (unlike in contextDialer) because
|
||||
// the timeout applies to the entire request, including reads from body.
|
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
c2 := *c |
||||
c2.Timeout = deadline.Sub(time.Now()) |
||||
c = &c2 |
||||
} |
||||
req2 := *req |
||||
return c, &req2 |
||||
} |
||||
@ -1,61 +0,0 @@ |
||||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// +build go1.5,!go1.6
|
||||
|
||||
package rpc |
||||
|
||||
import ( |
||||
"net" |
||||
"net/http" |
||||
"time" |
||||
|
||||
"golang.org/x/net/context" |
||||
) |
||||
|
||||
// In Go 1.5, dials cannot be canceled via a channel or context. The context deadline can
|
||||
// still be applied. Go 1.5 adds the ability to cancel HTTP requests via a channel.
|
||||
|
||||
// contextDialer returns a dialer that applies the deadline value from the given context.
|
||||
func contextDialer(ctx context.Context) *net.Dialer { |
||||
dialer := &net.Dialer{KeepAlive: tcpKeepAliveInterval} |
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
dialer.Deadline = deadline |
||||
} else { |
||||
dialer.Deadline = time.Now().Add(defaultDialTimeout) |
||||
} |
||||
return dialer |
||||
} |
||||
|
||||
// dialContext connects to the given address, aborting the dial if ctx is canceled.
|
||||
func dialContext(ctx context.Context, network, addr string) (net.Conn, error) { |
||||
return contextDialer(ctx).Dial(network, addr) |
||||
} |
||||
|
||||
// requestWithContext copies req, adding the cancelation channel and deadline from ctx.
|
||||
func requestWithContext(c *http.Client, req *http.Request, ctx context.Context) (*http.Client, *http.Request) { |
||||
// Set Timeout on the client if the context has a deadline.
|
||||
// Note that there is no default timeout (unlike in contextDialer) because
|
||||
// the timeout applies to the entire request, including reads from body.
|
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
c2 := *c |
||||
c2.Timeout = deadline.Sub(time.Now()) |
||||
c = &c2 |
||||
} |
||||
req2 := *req |
||||
req2.Cancel = ctx.Done() |
||||
return c, &req2 |
||||
} |
||||
@ -1,55 +0,0 @@ |
||||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// +build go1.6,!go1.7
|
||||
|
||||
package rpc |
||||
|
||||
import ( |
||||
"net" |
||||
"net/http" |
||||
"time" |
||||
|
||||
"golang.org/x/net/context" |
||||
) |
||||
|
||||
// In Go 1.6, net.Dialer gained the ability to cancel via a channel.
|
||||
|
||||
// contextDialer returns a dialer that applies the deadline value from the given context.
|
||||
func contextDialer(ctx context.Context) *net.Dialer { |
||||
dialer := &net.Dialer{Cancel: ctx.Done(), KeepAlive: tcpKeepAliveInterval} |
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
dialer.Deadline = deadline |
||||
} else { |
||||
dialer.Deadline = time.Now().Add(defaultDialTimeout) |
||||
} |
||||
return dialer |
||||
} |
||||
|
||||
// dialContext connects to the given address, aborting the dial if ctx is canceled.
|
||||
func dialContext(ctx context.Context, network, addr string) (net.Conn, error) { |
||||
return contextDialer(ctx).Dial(network, addr) |
||||
} |
||||
|
||||
// requestWithContext copies req, adding the cancelation channel and deadline from ctx.
|
||||
func requestWithContext(c *http.Client, req *http.Request, ctx context.Context) (*http.Client, *http.Request) { |
||||
// We set Timeout on the client for Go <= 1.5. There
|
||||
// is no need to do that here because the dial will be canceled
|
||||
// by package http.
|
||||
req2 := *req |
||||
req2.Cancel = ctx.Done() |
||||
return c, &req2 |
||||
} |
||||
@ -1,51 +0,0 @@ |
||||
// Copyright 2016 The go-ethereum Authors
|
||||
// This file is part of the go-ethereum library.
|
||||
//
|
||||
// The go-ethereum library is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU Lesser General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// The go-ethereum library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public License
|
||||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
// +build go1.7
|
||||
|
||||
package rpc |
||||
|
||||
import ( |
||||
"context" |
||||
"net" |
||||
"net/http" |
||||
"time" |
||||
) |
||||
|
||||
// In Go 1.7, context moved into the standard library and support
|
||||
// for cancelation via context was added to net.Dialer and http.Request.
|
||||
|
||||
// contextDialer returns a dialer that applies the deadline value from the given context.
|
||||
func contextDialer(ctx context.Context) *net.Dialer { |
||||
dialer := &net.Dialer{Cancel: ctx.Done(), KeepAlive: tcpKeepAliveInterval} |
||||
if deadline, ok := ctx.Deadline(); ok { |
||||
dialer.Deadline = deadline |
||||
} else { |
||||
dialer.Deadline = time.Now().Add(defaultDialTimeout) |
||||
} |
||||
return dialer |
||||
} |
||||
|
||||
// dialContext connects to the given address, aborting the dial if ctx is canceled.
|
||||
func dialContext(ctx context.Context, network, addr string) (net.Conn, error) { |
||||
d := &net.Dialer{KeepAlive: tcpKeepAliveInterval} |
||||
return d.DialContext(ctx, network, addr) |
||||
} |
||||
|
||||
// requestWithContext copies req, adding the cancelation channel and deadline from ctx.
|
||||
func requestWithContext(c *http.Client, req *http.Request, ctx context.Context) (*http.Client, *http.Request) { |
||||
return c, req.WithContext(ctx) |
||||
} |
||||
Loading…
Reference in new issue