Merge pull request #2963 from fjl/ens-solc-0.3.6

contracts/ens: regenerate binding with solc v0.3.6

contracts/ens/README.md

@@ -7,14 +7,14 @@ This package offers a simple binding that streamlines the registration arbitrary
 
 ## Development
 
-The SOL file in contract subdirectory implements the ENS root registry, a simple first-in-first-served registrar for the root namespace, and a simple resolver contract; they're used in tests, and can be used to deploy these contracts for your own purposes.
+The SOL file in contract subdirectory implements the ENS root registry, a simple
+first-in-first-served registrar for the root namespace, and a simple resolver contract;
+they're used in tests, and can be used to deploy these contracts for your own purposes.
 
 The solidity source code can be found at [github.com/arachnid/ens/](https://github.com/arachnid/ens/).
 
 The go bindings for ENS contracts are generated using `abigen` via the go generator:
 
 ```shell
-godep go generate ./swarm/services/ens
+go generate ./contracts/ens
 ```
-
-see the preprocessor directives in leading comments of ens.go and ens_test.go

contracts/ens/ens.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/contracts/ens/contract"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/contracts/ens/contract"
 )
 
 // swarm domain name registry and resolver