vendor.conf, cmd/ensdns/main.go: Changes in response to review

This commit is contained in:
Nick Johnson 2016-12-17 14:37:05 +00:00
parent bf934ca029
commit e3726a63ae
2 changed files with 10 additions and 14 deletions

View file

@ -16,17 +16,12 @@
package main package main
//go:generate abigen --sol contract/ens.sol --pkg contract --out contract/ens.go
//go:generate abigen --sol contract/resolver.sol --pkg contract --out contract/resolver.go
import ( import (
"encoding/hex" "encoding/hex"
"errors"
"flag" "flag"
"log" "log"
"os"
"os/signal"
"strings" "strings"
"syscall"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
@ -36,10 +31,13 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
) )
const NotAuthoritative = errors.New("No resolver for this domain")
const NoSuchName = errors.New("Name not found")
var ( var (
gethAddressFlag = flag.String("geth", "ws://localhost:8546", "Path to connect to geth on") ethapiFlag = flag.String("ethapi", "ws://localhost:8546", "Path to connect to Ethereum node on")
registryAddressFlag = flag.String("registry", "", "Address of ENS registry") registryAddressFlag = flag.String("registry", "", "Address of ENS registry")
listenAddressFlag = flag.String("address", ":8053", "Address and port to listen on") listenAddressFlag = flag.String("address", ":53", "Address and port to listen on")
) )
func nameHash(name string) common.Hash { func nameHash(name string) common.Hash {
@ -172,9 +170,9 @@ func serve(addr string) {
func main() { func main() {
flag.Parse() flag.Parse()
client, err := ethclient.Dial(*gethAddressFlag) client, err := ethclient.Dial(*ethapiFlag)
if err != nil { if err != nil {
log.Fatalf("Error connecting to geth: %v", err) log.Fatalf("Error connecting to Ethereum API: %v", err)
} }
ensdns, err := New(client, common.HexToAddress(*registryAddressFlag)) ensdns, err := New(client, common.HexToAddress(*registryAddressFlag))
@ -187,8 +185,5 @@ func main() {
log.Printf("Listening on %s", *listenAddressFlag) log.Printf("Listening on %s", *listenAddressFlag)
sig := make(chan os.Signal) select {}
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
s := <-sig
log.Printf("Signal (%s) received, stopping\n", s)
} }

View file

@ -16,6 +16,7 @@ github.com/jackpal/go-nat-pmp v1.0.1-4-g1fa385a
github.com/mattn/go-colorable v0.0.6-7-g6e26b35 github.com/mattn/go-colorable v0.0.6-7-g6e26b35
github.com/mattn/go-isatty 66b8e73 github.com/mattn/go-isatty 66b8e73
github.com/mattn/go-runewidth v0.0.1-10-g737072b github.com/mattn/go-runewidth v0.0.1-10-g737072b
github.com/miekg/dns 4f8d08a
github.com/mitchellh/go-wordwrap ad45545 github.com/mitchellh/go-wordwrap ad45545
github.com/nsf/termbox-go b6acae5 github.com/nsf/termbox-go b6acae5
github.com/pborman/uuid v1.0-17-g3d4f2ba github.com/pborman/uuid v1.0-17-g3d4f2ba