diff options
author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 20:15:57 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 20:15:57 +0800 |
commit | 5c2f1e00148f16655d3fb63b93920b1108165c56 (patch) | |
tree | f3b453e05a8da60ceb006b5899554f8fbad86cf4 /contracts/ens/ens_test.go | |
parent | a139041d409d0ffaf81c7cf931c6b24299a05705 (diff) | |
download | dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.gz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.zst dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.zip |
all: update generated code (#15808)
* core/types, core/vm, eth, tests: regenerate gencodec files
* Makefile: update devtools target
Install protoc-gen-go and print reminders about npm, solc and protoc.
Also switch to github.com/kevinburke/go-bindata because it's more
maintained.
* contracts/ens: update contracts and regenerate with solidity v0.4.19
The newer upstream version of the FIFSRegistrar contract doesn't set the
resolver anymore. The resolver is now deployed separately.
* contracts/release: regenerate with solidity v0.4.19
* contracts/chequebook: fix fallback and regenerate with solidity v0.4.19
The contract didn't have a fallback function, payments would be rejected
when compiled with newer solidity. References to 'mortal' and 'owned'
use the local file system so we can compile without network access.
* p2p/discv5: regenerate with recent stringer
* cmd/faucet: regenerate
* dashboard: regenerate
* eth/tracers: regenerate
* internal/jsre/deps: regenerate
* dashboard: avoid sed -i because it's not portable
* accounts/usbwallet/internal/trezor: fix go generate warnings
Diffstat (limited to 'contracts/ens/ens_test.go')
-rw-r--r-- | contracts/ens/ens_test.go | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/contracts/ens/ens_test.go b/contracts/ens/ens_test.go index 9ab137581..0016f47db 100644 --- a/contracts/ens/ens_test.go +++ b/contracts/ens/ens_test.go @@ -22,6 +22,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" + "github.com/ethereum/go-ethereum/contracts/ens/contract" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" ) @@ -36,27 +37,36 @@ var ( func TestENS(t *testing.T) { contractBackend := backends.NewSimulatedBackend(core.GenesisAlloc{addr: {Balance: big.NewInt(1000000000)}}) transactOpts := bind.NewKeyedTransactor(key) - // Workaround for bug estimating gas in the call to Register - transactOpts.GasLimit = 1000000 - ens, err := DeployENS(transactOpts, contractBackend) + ensAddr, ens, err := DeployENS(transactOpts, contractBackend) if err != nil { - t.Fatalf("expected no error, got %v", err) + t.Fatalf("can't deploy root registry: %v", err) } contractBackend.Commit() - _, err = ens.Register(name) - if err != nil { - t.Fatalf("expected no error, got %v", err) + // Set ourself as the owner of the name. + if _, err := ens.Register(name); err != nil { + t.Fatalf("can't register: %v", err) } contractBackend.Commit() - _, err = ens.SetContentHash(name, hash) + // Deploy a resolver and make it responsible for the name. + resolverAddr, _, _, err := contract.DeployPublicResolver(transactOpts, contractBackend, ensAddr) if err != nil { - t.Fatalf("expected no error, got %v", err) + t.Fatalf("can't deploy resolver: %v", err) + } + if _, err := ens.SetResolver(ensNode(name), resolverAddr); err != nil { + t.Fatalf("can't set resolver: %v", err) + } + contractBackend.Commit() + + // Set the content hash for the name. + if _, err = ens.SetContentHash(name, hash); err != nil { + t.Fatalf("can't set content hash: %v", err) } contractBackend.Commit() + // Try to resolve the name. vhost, err := ens.Resolve(name) if err != nil { t.Fatalf("expected no error, got %v", err) |