Merge branch 'master' of github.com:ethereum/go-ethereum

thomasmodeneis · thomasmodeneis · commit a48f2a45b9bc · 2018-04-05T16:36:08.000+02:00
# Conflicts:
#	internal/ethapi/api.go
diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 )
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
@@ -24,7 +24,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go
@@ -27,8 +27,6 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go
@@ -24,7 +24,6 @@ import (
 	"path/filepath"
 
 	"github.com/pborman/uuid"
-	"gopkg.in/urfave/cli.v1"
 
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go
@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/crypto"
diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"os"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 )
 
diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go
@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go
@@ -22,8 +22,6 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/console"
 	"github.com/ethereum/go-ethereum/crypto"
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
@@ -22,8 +22,6 @@ import (
 	"math/big"
 	"os"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 )
 
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/syndtr/goleveldb/leveldb/util"
-	"gopkg.in/urfave/cli.v1"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/common"
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
@@ -24,8 +24,6 @@ import (
 	"strings"
 	"syscall"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/console"
 	"github.com/ethereum/go-ethereum/node"
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -25,8 +25,6 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/cmd/utils"
diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go
@@ -23,8 +23,6 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/eth"
diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go
@@ -26,7 +26,6 @@ import (
 	"time"
 
 	"github.com/gizak/termui"
-	"gopkg.in/urfave/cli.v1"
 
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/node"
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
@@ -24,8 +24,6 @@ import (
 
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/internal/debug"
 )
diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go
@@ -45,8 +45,6 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/discover"
diff --git a/cmd/puppeth/puppeth.go b/cmd/puppeth/puppeth.go
@@ -23,8 +23,6 @@ import (
 	"strings"
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/log"
 )
 
diff --git a/cmd/swarm/db.go b/cmd/swarm/db.go
@@ -22,8 +22,6 @@ import (
 	"os"
 	"path/filepath"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/swarm/storage"
diff --git a/cmd/swarm/hash.go b/cmd/swarm/hash.go
@@ -21,8 +21,6 @@ import (
 	"fmt"
 	"os"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/swarm/storage"
 )
diff --git a/cmd/swarm/list.go b/cmd/swarm/list.go
@@ -22,8 +22,6 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
 )
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
@@ -44,8 +44,6 @@ import (
 	"github.com/ethereum/go-ethereum/swarm"
 	bzzapi "github.com/ethereum/go-ethereum/swarm/api"
 	swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics"
-
-	"gopkg.in/urfave/cli.v1"
 )
 
 const clientIdentifier = "swarm"
diff --git a/cmd/swarm/manifest.go b/cmd/swarm/manifest.go
@@ -24,8 +24,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/swarm/api"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
diff --git a/cmd/swarm/upload.go b/cmd/swarm/upload.go
@@ -30,8 +30,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	swarm "github.com/ethereum/go-ethereum/swarm/api/client"
 )
diff --git a/cmd/utils/customflags.go b/cmd/utils/customflags.go
@@ -27,8 +27,6 @@ import (
 	"path"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/common/math"
 )
 
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -28,8 +28,6 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common"
diff --git a/console/console.go b/console/console.go
@@ -28,7 +28,6 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/mattn/go-colorable"
 	"github.com/peterh/liner"
 	"github.com/robertkrimen/otto"
 
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -27,7 +27,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/golang-lru"
 	"gopkg.in/karalabe/cookiejar.v2/collections/prque"
 
 	"github.com/ethereum/go-ethereum/common"
diff --git a/core/headerchain.go b/core/headerchain.go
@@ -26,8 +26,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/golang-lru"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/core/types"
diff --git a/eth/peer.go b/eth/peer.go
@@ -23,8 +23,6 @@ import (
 	"sync"
 	"time"
 
-	"gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/p2p"
diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go
@@ -24,7 +24,6 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go
@@ -16,8 +16,6 @@
 
 package ethclient
 
-import "github.com/ethereum/go-ethereum"
-
 // Verify that Client implements the ethereum interfaces.
 var (
 	_ = ethereum.ChainReader(&Client{})
diff --git a/internal/debug/flags.go b/internal/debug/flags.go
@@ -25,7 +25,6 @@ import (
 	"runtime"
 
 	colorable "github.com/mattn/go-colorable"
-	"gopkg.in/urfave/cli.v1"
 
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/log/term"
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -26,6 +26,9 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/util"
+
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/keystore"
 	"github.com/ethereum/go-ethereum/common"
diff --git a/light/lightchain.go b/light/lightchain.go
@@ -24,8 +24,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/hashicorp/golang-lru"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/core"
diff --git a/miner/worker.go b/miner/worker.go
@@ -24,8 +24,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/consensus"
 	"github.com/ethereum/go-ethereum/consensus/misc"
diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go
@@ -25,8 +25,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/jackpal/go-nat-pmp"
-
 	"github.com/ethereum/go-ethereum/log"
 )
 
diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go
@@ -21,8 +21,6 @@ import (
 	"net"
 	"strings"
 	"time"
-
-	"github.com/jackpal/go-nat-pmp"
 )
 
 // natPMPClient adapts the NAT-PMP protocol implementation so it conforms to
diff --git a/rpc/ipc_windows.go b/rpc/ipc_windows.go
@@ -22,8 +22,6 @@ import (
 	"context"
 	"net"
 	"time"
-
-	"gopkg.in/natefinch/npipe.v2"
 )
 
 // This is used if the dialing context has no deadline. It is much smaller than the
diff --git a/rpc/server.go b/rpc/server.go
@@ -25,8 +25,6 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/log"
 )
 
diff --git a/rpc/types.go b/rpc/types.go
@@ -23,8 +23,6 @@ import (
 	"strings"
 	"sync"
 
-	"gopkg.in/fatih/set.v0"
-
 	"github.com/ethereum/go-ethereum/common/hexutil"
 )
 
diff --git a/rpc/websocket.go b/rpc/websocket.go
@@ -30,7 +30,6 @@ import (
 	"time"
 
 	"golang.org/x/net/websocket"
-	"gopkg.in/fatih/set.v0"
 
 	"github.com/ethereum/go-ethereum/log"
 )
diff --git a/swarm/metrics/flags.go b/swarm/metrics/flags.go
@@ -19,8 +19,6 @@ package metrics
 import (
 	"time"
 
-	"gopkg.in/urfave/cli.v1"
-
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/log"
 	gethmetrics "github.com/ethereum/go-ethereum/metrics"
diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/token.go b/vendor/github.com/Azure/go-autorest/autorest/azure/token.go
diff --git a/vendor/github.com/StackExchange/wmi/swbemservices.go b/vendor/github.com/StackExchange/wmi/swbemservices.go
diff --git a/vendor/github.com/StackExchange/wmi/wmi.go b/vendor/github.com/StackExchange/wmi/wmi.go
diff --git a/vendor/github.com/fatih/color/color.go b/vendor/github.com/fatih/color/color.go
diff --git a/vendor/github.com/gizak/termui/events.go b/vendor/github.com/gizak/termui/events.go
diff --git a/vendor/github.com/gizak/termui/textbuilder.go b/vendor/github.com/gizak/termui/textbuilder.go
diff --git a/vendor/github.com/mattn/go-colorable/colorable_windows.go b/vendor/github.com/mattn/go-colorable/colorable_windows.go
diff --git a/vendor/github.com/nsf/termbox-go/api.go b/vendor/github.com/nsf/termbox-go/api.go
diff --git a/vendor/github.com/nsf/termbox-go/termbox_windows.go b/vendor/github.com/nsf/termbox-go/termbox_windows.go
diff --git a/vendor/github.com/olekukonko/tablewriter/util.go b/vendor/github.com/olekukonko/tablewriter/util.go
diff --git a/vendor/github.com/robertkrimen/otto/file/file.go b/vendor/github.com/robertkrimen/otto/file/file.go
diff --git a/vendor/github.com/robertkrimen/otto/parser/parser.go b/vendor/github.com/robertkrimen/otto/parser/parser.go
diff --git a/whisper/shhclient/client.go b/whisper/shhclient/client.go

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"errors"`
`22`	`22`	`"math/big"`
`23`	`23`
`24`		`- "github.com/ethereum/go-ethereum"`
`25`	`24`	`"github.com/ethereum/go-ethereum/common"`
`26`	`25`	`"github.com/ethereum/go-ethereum/core/types"`
`27`	`26`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"os"`
`22`	`22`
`23`		`- "gopkg.in/urfave/cli.v1"`
`24`		`-`
`25`	`23`	`"github.com/ethereum/go-ethereum/cmd/utils"`
`26`	`24`	`)`
`27`	`25`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@ import (`
`22`	`22`	`"math/big"`
`23`	`23`	`"os"`
`24`	`24`
`25`		`- "gopkg.in/urfave/cli.v1"`
`26`		`-`
`27`	`25`	`"github.com/ethereum/go-ethereum/cmd/utils"`
`28`	`26`	`)`
`29`	`27`