Registrar and contractInfo handling

* resolver -> common/registrar
  * global registrar name registry interface
  * add Call to resolver backend interface
  * the hashReg and UrlHing contracts now initialised from global registry
  * initialization of contracts uniform
  * improve errors and more econsistent method names
* common/registrar/ethreg: versioned registrar
* integrate new naming and registrar in natspec
* js console api: setGlobalRegistrar, setHashReg, setUrlHint
* js test TestContract uses mining - tests fixed all pass
* eth/backend: allow PoW test mode (small ethash DAG)
* console jsre refers to resolver.abi/addr,
* cmd/geth/contracts.go moved to common/registrar

1 files changed, 96 insertions, 0 deletions

diff --git a/common/registrar/registrar_test.go b/common/registrar/registrar_test.go
new file mode 100644
index 000000000..5612e691c
--- /dev/null
+++ b/common/registrar/registrar_test.go
@@ -0,0 +1,96 @@
+package registrar
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+)
+
+type testBackend struct {
+	// contracts mock
+	contracts map[string](map[string]string)
+}
+
+var (
+	text     = "test"
+	codehash = common.StringToHash("1234")
+	hash     = common.BytesToHash(crypto.Sha3([]byte(text)))
+	url      = "bzz://bzzhash/my/path/contr.act"
+)
+
+func NewTestBackend() *testBackend {
+	HashRegAddr = common.BigToAddress(common.Big0).Hex() //[2:]
+	UrlHintAddr = common.BigToAddress(common.Big1).Hex() //[2:]
+	self := &testBackend{}
+	self.contracts = make(map[string](map[string]string))
+
+	self.contracts[HashRegAddr[2:]] = make(map[string]string)
+	key := storageAddress(storageMapping(storageIdx2Addr(1), codehash[:]))
+	self.contracts[HashRegAddr[2:]][key] = hash.Hex()
+
+	self.contracts[UrlHintAddr[2:]] = make(map[string]string)
+	mapaddr := storageMapping(storageIdx2Addr(1), hash[:])
+
+	key = storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(0)))
+	self.contracts[UrlHintAddr[2:]][key] = common.ToHex([]byte(url))
+	key = storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(1)))
+	self.contracts[UrlHintAddr[2:]][key] = "0x0"
+	return self
+}
+
+func (self *testBackend) StorageAt(ca, sa string) (res string) {
+	c := self.contracts[ca]
+	if c == nil {
+		return
+	}
+	res = c[sa]
+	return
+}
+
+func (self *testBackend) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) {
+	return "", nil
+}
+
+func (self *testBackend) Call(fromStr, toStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, string, error) {
+	return "", "", nil
+}
+
+func TestSetGlobalRegistrar(t *testing.T) {
+	b := NewTestBackend()
+	res := New(b)
+	err := res.SetGlobalRegistrar("addresshex", common.BigToAddress(common.Big1))
+	if err != nil {
+		t.Errorf("unexpected error: %v'", err)
+	}
+}
+
+func TestHashToHash(t *testing.T) {
+	b := NewTestBackend()
+	res := New(b)
+	// res.SetHashReg()
+
+	got, err := res.HashToHash(codehash)
+	if err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else {
+		if got != hash {
+			t.Errorf("incorrect result, expected '%v', got '%v'", hash.Hex(), got.Hex())
+		}
+	}
+}
+
+func TestHashToUrl(t *testing.T) {
+	b := NewTestBackend()
+	res := New(b)
+	// res.SetUrlHint()
+
+	got, err := res.HashToUrl(hash)
+	if err != nil {
+		t.Errorf("expected 	 error, got %v", err)
+	} else {
+		if got != url {
+			t.Errorf("incorrect result, expected '%v', got '%s'", url, got)
+		}
+	}
+}