Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ethereum/go-ethereum
Browse files Browse the repository at this point in the history 
# Conflicts:
#	internal/ethapi/api.go
  • Loading branch information
@thomasmodeneis
thomasmodeneis committed Apr 5, 2018
1 parent a1b426a commit a48f2a4
Show file tree
Hide file tree
Showing 57 changed files with 3 additions and 95 deletions.
1 change: 0 additions & 1 deletion accounts/abi/bind/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 0 additions & 1 deletion accounts/abi/bind/backends/simulated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion accounts/abi/bind/base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions accounts/keystore/account_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cmd/ethkey/generate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/ethkey/inspect.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/ethkey/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import (
"fmt"
"os"

"gopkg.in/urfave/cli.v1"

"github.com/ethereum/go-ethereum/cmd/utils"
)

Expand Down
2 changes: 0 additions & 2 deletions cmd/ethkey/message.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/ethkey/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/evm/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import (
"math/big"
"os"

"gopkg.in/urfave/cli.v1"

"github.com/ethereum/go-ethereum/cmd/utils"
)

Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/accountcmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cmd/geth/chaincmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/consolecmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/misccmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion cmd/geth/monitorcmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/usage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 0 additions & 2 deletions cmd/p2psim/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/puppeth/puppeth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"strings"
"time"

"gopkg.in/urfave/cli.v1"

"github.com/ethereum/go-ethereum/log"
)

Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/hash.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/manifest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions cmd/swarm/upload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 0 additions & 2 deletions cmd/utils/customflags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ import (
"path"
"strings"

"gopkg.in/urfave/cli.v1"

"github.com/ethereum/go-ethereum/common/math"
)

Expand Down
2 changes: 0 additions & 2 deletions cmd/utils/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion console/console.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"strings"
"syscall"

"github.com/mattn/go-colorable"
"github.com/peterh/liner"
"github.com/robertkrimen/otto"

Expand Down
1 change: 0 additions & 1 deletion core/blockchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions core/headerchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions eth/peer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion ethclient/ethclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions ethclient/ethclient_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package ethclient

import "github.com/ethereum/go-ethereum"

// Verify that Client implements the ethereum interfaces.
var (
_ = ethereum.ChainReader(&Client{})
Expand Down
1 change: 0 additions & 1 deletion internal/debug/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions internal/ethapi/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions light/lightchain.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions miner/worker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions p2p/nat/nat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (
"sync"
"time"

"github.com/jackpal/go-nat-pmp"

"github.com/ethereum/go-ethereum/log"
)

Expand Down
2 changes: 0 additions & 2 deletions p2p/nat/natpmp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions rpc/ipc_windows.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions rpc/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import (
"sync"
"sync/atomic"

"gopkg.in/fatih/set.v0"

"github.com/ethereum/go-ethereum/log"
)

Expand Down
2 changes: 0 additions & 2 deletions rpc/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ import (
"strings"
"sync"

"gopkg.in/fatih/set.v0"

"github.com/ethereum/go-ethereum/common/hexutil"
)

Expand Down
1 change: 0 additions & 1 deletion rpc/websocket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"time"

"golang.org/x/net/websocket"
"gopkg.in/fatih/set.v0"

"github.com/ethereum/go-ethereum/log"
)
Expand Down
2 changes: 0 additions & 2 deletions swarm/metrics/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion vendor/github.com/Azure/go-autorest/autorest/azure/token.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a48f2a4

Please sign in to comment.