records: use SOA mname instead of rname

errorutil/errorutil.go

@@ -11,5 +11,4 @@ func Ignore(f ErrorFunction) {
 	if err := f(); err != nil {
 		return
 	}
-	return
 }

exchanger/exchanger_test.go

@@ -60,14 +60,6 @@ func TestInstrumentation(t *testing.T) {
 	}
 }
 
-func stubs(ed ...exchanged) []Exchanger {
-	exs := make([]Exchanger, len(ed))
-	for i := range ed {
-		exs[i] = stub(ed[i])
-	}
-	return exs
-}
-
 func stub(e exchanged) Exchanger {
 	return Func(func(*dns.Msg, string) (*dns.Msg, time.Duration, error) {
 		return e.m, e.rtt, e.err

records/generator.go

@@ -184,7 +184,7 @@ func (rg *RecordGenerator) ParseState(c Config, masters ...string) error {
 		hostSpec = labels.RFC952
 	}
 
-	return rg.InsertState(sj, c.Domain, c.SOARname, c.Listener, masters, c.IPSources, hostSpec)
+	return rg.InsertState(sj, c.Domain, c.SOAMname, c.Listener, masters, c.IPSources, hostSpec)
 }
 
 // Tries each master and looks for the leader

records/generator_test.go

@@ -306,7 +306,7 @@ func TestNTasks(t *testing.T) {
 	rg.insertRR("blah.mesos", "10.0.0.1", A)
 	rg.insertRR("blah.mesos", "10.0.0.2", A)
 
-	k, _ := rg.As["blah.mesos"]
+	k := rg.As["blah.mesos"]
 
 	if len(k) != 2 {
 		t.Error("should only have 2 A records")

resolver/resolver_test.go

@@ -410,21 +410,6 @@ func fakeDNS() (*Resolver, error) {
 	return res, nil
 }
 
-func onError(abort <-chan struct{}, errCh <-chan error, f func(error)) <-chan struct{} {
-	ch := make(chan struct{})
-	go func() {
-		select {
-		case <-abort:
-		case e := <-errCh:
-			if e != nil {
-				defer close(ch)
-				f(e)
-			}
-		}
-	}()
-	return ch
-}
-
 func TestMultiError(t *testing.T) {
 	me := multiError(nil)
 	me.Add()