Skip to content

Commit

Permalink
update imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@quan8
quan8 committed Oct 31, 2019
1 parent bd05968 commit 5108db3
Show file tree
Hide file tree
Showing 608 changed files with 5,383 additions and 3,300 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ ones either). To start a `geth` instance for mining, run it with all your usual
by:

```shell
$ geth <usual-flags> --mine --minerthreads=1 --etherbase=0x0000000000000000000000000000000000000000
$ geth <usual-flags> --mine --miner.threads=1 --etherbase=0x0000000000000000000000000000000000000000
```

Which will start mining blocks and transactions on a single CPU thread, crediting all
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/abi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"fmt"
"io"

"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common"
)

// The ABI holds information about a contract's context and available
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/abi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

const jsondata = `
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"io"
"io/ioutil"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/accounts"
"github.com/Fantom-foundation/go-ethereum/accounts/external"
"github.com/Fantom-foundation/go-ethereum/accounts/keystore"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

// NewTransactor is a utility method to easily create a transaction signer from
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"errors"
"math/big"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
)

var (
Expand Down
32 changes: 16 additions & 16 deletions accounts/abi/bind/backends/simulated.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ 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"
"github.com/ethereum/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/bloombits"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/eth/filters"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event"
"github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc"
"github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common/math"
"github.com/Fantom-foundation/go-ethereum/consensus/ethash"
"github.com/Fantom-foundation/go-ethereum/core"
"github.com/Fantom-foundation/go-ethereum/core/bloombits"
"github.com/Fantom-foundation/go-ethereum/core/rawdb"
"github.com/Fantom-foundation/go-ethereum/core/state"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/core/vm"
"github.com/Fantom-foundation/go-ethereum/eth/filters"
"github.com/Fantom-foundation/go-ethereum/ethdb"
"github.com/Fantom-foundation/go-ethereum/event"
"github.com/Fantom-foundation/go-ethereum/params"
"github.com/Fantom-foundation/go-ethereum/rpc"
)

// This nil assignment ensures compile time that SimulatedBackend implements bind.ContractBackend.
Expand Down
14 changes: 7 additions & 7 deletions accounts/abi/bind/backends/simulated_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"math/big"
"testing"

ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
ethereum "github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind/backends"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

func TestSimulatedBackend(t *testing.T) {
Expand Down
14 changes: 7 additions & 7 deletions accounts/abi/bind/base.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ 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"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event"
"github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/event"
)

// SignerFn is a signer function callback when a contract requires a method to
Expand Down Expand Up @@ -218,7 +218,7 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
}
}
// If the contract surely has code (or code is not needed), estimate the transaction
msg := ethereum.CallMsg{From: opts.From, To: contract, Value: value, Data: input}
msg := ethereum.CallMsg{From: opts.From, To: contract, GasPrice: gasPrice, Value: value, Data: input}
gasLimit, err = c.transactor.EstimateGas(ensureContext(opts.Context), msg)
if err != nil {
return nil, fmt.Errorf("failed to estimate gas needed: %v", err)
Expand Down
16 changes: 8 additions & 8 deletions accounts/abi/bind/base_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common/hexutil"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/rlp"
)

type mockCaller struct {
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/bind.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Package bind generates Ethereum contract Go bindings.
//
// Detailed usage document and tutorial available on the go-ethereum Wiki page:
// https://github.com/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
// https://github.com/Fantom-foundation/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
package bind

import (
Expand All @@ -30,8 +30,8 @@ import (
"text/template"
"unicode"

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/log"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/log"
)

// Lang is a target programming language selector to generate bindings for.
Expand Down
134 changes: 67 additions & 67 deletions accounts/abi/bind/bind_test.go
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions accounts/abi/bind/template.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package bind

import "github.com/ethereum/go-ethereum/accounts/abi"
import "github.com/Fantom-foundation/go-ethereum/accounts/abi"

// tmplData is the data structure required to fill the binding template.
type tmplData struct {
Expand Down Expand Up @@ -88,12 +88,12 @@ import (
"math/big"
"strings"
ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
ethereum "github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/event"
)
// Reference imports to suppress errors if they are not otherwise used.
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/topics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"math/big"
"reflect"

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

// makeTopics converts a filter query argument list into a filter topic set.
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/bind/topics_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"reflect"
"testing"

"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/accounts/abi"
"github.com/Fantom-foundation/go-ethereum/common"
)

func TestMakeTopics(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"fmt"
"time"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/log"
)

// WaitMined waits for tx to be mined on the blockchain.
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/util_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"testing"
"time"

"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind"
"github.com/Fantom-foundation/go-ethereum/accounts/abi/bind/backends"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"strings"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

// Event is an event potentially triggered by the EVM's LOG mechanism. The Event
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/event_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/crypto"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -356,7 +356,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass

/*
Taken from
https://github.com/ethereum/go-ethereum/pull/15568
https://github.com/Fantom-foundation/go-ethereum/pull/15568
*/

type testResult struct {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/method.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"github.com/ethereum/go-ethereum/crypto"
"github.com/Fantom-foundation/go-ethereum/crypto"
)

// Method represents a callable given a `Name` and whether the method is a constant.
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/numbers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/big"
"reflect"

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

var (
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/pack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"math/big"
"reflect"

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

// packBytesSlice packs the given bytes as [L, V] as the canonical representation
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common"
)

func TestPack(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/type_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"

"github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common"
)

// typeWithoutStringer is a alias for the Type type which simply doesn't implement
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"math/big"
"reflect"

"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/stretchr/testify/require"
)

Expand Down
8 changes: 4 additions & 4 deletions accounts/accounts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"fmt"
"math/big"

ethereum "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event"
ethereum "github.com/Fantom-foundation/go-ethereum"
"github.com/Fantom-foundation/go-ethereum/common"
"github.com/Fantom-foundation/go-ethereum/core/types"
"github.com/Fantom-foundation/go-ethereum/event"
"golang.org/x/crypto/sha3"
)

Expand Down
2 changes: 1 addition & 1 deletion accounts/accounts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"bytes"
"testing"

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

func TestTextHash(t *testing.T) {
Expand Down
Loading

0 comments on commit 5108db3

Please sign in to comment.