From 02e72d352a489eb0309bf3264ee7d857fbea059b Mon Sep 17 00:00:00 2001
From: Hugo Landau <hlandau@devever.net>
Date: Wed, 12 Nov 2014 09:38:20 +0000
Subject: [PATCH] Removed test hooks

---
 backend/backend.go   |  5 +++++
 namecoin/namecoin.go | 17 -----------------
 server/server.go     |  1 +
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/backend/backend.go b/backend/backend.go
index 6023a8f..b1e64ea 100644
--- a/backend/backend.go
+++ b/backend/backend.go
@@ -11,11 +11,13 @@ import "net"
 import "github.com/hlandau/ncdns/namecoin"
 import "github.com/hlandau/madns/merr"
 import "github.com/hlandau/ncdns/util"
+import "sync"
 
 type Backend struct {
   //s *Server
   nc namecoin.NamecoinConn
   cache lru.Cache // items are of type *Domain
+  cacheMutex sync.Mutex
   cfg Config
 }
 
@@ -85,6 +87,9 @@ func toNamecoinName(basename string) (string, error) {
 }
 
 func (b *Backend) getNamecoinEntry(name string) (*domain, error) {
+  b.cacheMutex.Lock()
+  defer b.cacheMutex.Unlock()
+
   if dd, ok := b.cache.Get(name); ok {
     d := dd.(*domain)
     return d, nil
diff --git a/namecoin/namecoin.go b/namecoin/namecoin.go
index b4c432e..59a57bc 100644
--- a/namecoin/namecoin.go
+++ b/namecoin/namecoin.go
@@ -27,23 +27,6 @@ type NamecoinConn struct {
 // If the domain exists, returns the value stored in Namecoin, which should be JSON.
 // Note that this will return domain data even if the domain is expired.
 func (nc *NamecoinConn) Query(name string) (v string, err error) {
-  if name == "d/badger2" {
-    v = `{"ns":["ns1.badger.bit","ns2.badger.bit"],"map":{"ns1":{"ip":["1.2.3.4"],"ip6":["::beef:1"]},"ns2":{"ip":["2.3.4.5"],"ip6":["::beef:2"]}},"ds":[[12345,8,2,"lu6y/9mwDNRpTngni179qwqARGVntp9jTaB48NkPAbo="]]}`
-    return
-  }
-  if name == "d/badger" {
-    v = `{"ns":["ns1.badger.bit.genoq.org"],"map":{"ns1":{"ip":["192.99.208.248"]}},"ds":[[4015,8,1,"zvJorv4AV1it/HukLVw5wc6wtnI="],[4015,8,2,"mGW8W55p5JajShyDBvmAdPFOAEcA8IMDzwL0nO5AxAQ="]]}`
-    return
-  }
-  if name == "d/secure" {
-    v = `{"ns":["ns1.example.com","ns2.example.com"],"ds":[[12345,8,2,"lu6y/9mwDNRpTngni179qwqARGVntp9jTaB48NkPAbo="]]}`
-    return
-  }
-  if name == "d/insecure" {
-    v = `{"ns":["ns1.example.com","ns2.example.com"]}`
-    return
-  }
-
   cmd, err := extratypes.NewNameShowCmd(newID(), name)
   if err != nil {
     //log.Info("NC NEWCMD ", err)
diff --git a/server/server.go b/server/server.go
index ad5f936..53c54ab 100644
--- a/server/server.go
+++ b/server/server.go
@@ -44,6 +44,7 @@ func NewServer(cfg *ServerConfig) (s *Server, err error) {
   bcfg := &backend.Config {
     RPCUsername: cfg.NamecoinRPCUsername,
     RPCPassword: cfg.NamecoinRPCPassword,
+    RPCAddress: cfg.NamecoinRPCAddress,
     CacheMaxEntries: cfg.CacheMaxEntries,
     SelfName: cfg.SelfName,
     SelfIP: cfg.SelfIP,