aboutsummaryrefslogtreecommitdiffstats
path: root/common/registrar/registrar_test.go
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-09-22 16:34:58 +0800
committerzelig <viktor.tron@gmail.com>2015-10-22 06:22:39 +0800
commit8b81ad1fc40080af441c0c6df94f0b2ea46e320b (patch)
tree7d8817ec84be38b911f967f1ecd5618d02e4caa9 /common/registrar/registrar_test.go
parent58d0752fdd1c7363fb1a127cd7e0a86d7602be02 (diff)
downloaddexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.gz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.bz2
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.lz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.xz
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.tar.zst
dexon-8b81ad1fc40080af441c0c6df94f0b2ea46e320b.zip
console:
* lines with leading space are ommitted from history * exit processed even with whitespace around * all whitespace lines (not only empty ones) are ignored add 7 missing commands to admin api autocomplete registrar: methods now return proper error if reg addresses are not set. fixes #1457 rpc/console: fix personal.newAccount() regression. Now all comms accept interactive password registrar: add registrar tests for errors crypto: catch AES decryption error on presale wallet import + fix error msg format. fixes #1580 CLI: improve error message when starting a second instance of geth. fixes #1564 cli/accounts: unlock multiple accounts. fixes #1785 * make unlocking multiple accounts work with inline <() fd * passwdfile now correctly read only once * improve logs * fix CLI help text for unlocking fix regression with docRoot / admin API * docRoot/jspath passed to rpc/api ParseApis, which passes onto adminApi * docRoot field for JS console in order to pass when RPC is (re)started * improve flag desc for jspath common/docserver: catch http errors from response fix rpc/api tests common/natspec: fix end to end test (skipped because takes 8s) registrar: fix major regression: * deploy registrars on frontier * register HashsReg and UrlHint in GlobalRegistrar. * set all 3 contract addresses in code * zero out addresses first in tests
Diffstat (limited to 'common/registrar/registrar_test.go')
-rw-r--r--common/registrar/registrar_test.go62
1 files changed, 54 insertions, 8 deletions
diff --git a/common/registrar/registrar_test.go b/common/registrar/registrar_test.go
index 63f283563..68ee65ab4 100644
--- a/common/registrar/registrar_test.go
+++ b/common/registrar/registrar_test.go
@@ -36,29 +36,31 @@ var (
)
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))
+ return self
+}
+func (self *testBackend) initHashReg() {
self.contracts[HashRegAddr[2:]] = make(map[string]string)
key := storageAddress(storageMapping(storageIdx2Addr(1), codehash[:]))
self.contracts[HashRegAddr[2:]][key] = hash.Hex()
+}
+func (self *testBackend) initUrlHint() {
self.contracts[UrlHintAddr[2:]] = make(map[string]string)
mapaddr := storageMapping(storageIdx2Addr(1), hash[:])
- key = storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(0)))
+ 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
+ return "0x0"
}
res = c[sa]
return
@@ -84,9 +86,31 @@ func TestSetGlobalRegistrar(t *testing.T) {
func TestHashToHash(t *testing.T) {
b := NewTestBackend()
res := New(b)
- // res.SetHashReg()
+ HashRegAddr = "0x0"
got, err := res.HashToHash(codehash)
+ if err == nil {
+ t.Errorf("expected error")
+ } else {
+ exp := "HashReg address is not set"
+ if err.Error() != exp {
+ t.Errorf("incorrect error, expected '%v', got '%v'", exp, err.Error())
+ }
+ }
+
+ HashRegAddr = common.BigToAddress(common.Big1).Hex() //[2:]
+ got, err = res.HashToHash(codehash)
+ if err == nil {
+ t.Errorf("expected error")
+ } else {
+ exp := "HashToHash: content hash not found for '" + codehash.Hex() + "'"
+ if err.Error() != exp {
+ t.Errorf("incorrect error, expected '%v', got '%v'", exp, err.Error())
+ }
+ }
+
+ b.initHashReg()
+ got, err = res.HashToHash(codehash)
if err != nil {
t.Errorf("expected no error, got %v", err)
} else {
@@ -99,11 +123,33 @@ func TestHashToHash(t *testing.T) {
func TestHashToUrl(t *testing.T) {
b := NewTestBackend()
res := New(b)
- // res.SetUrlHint()
+ UrlHintAddr = "0x0"
got, err := res.HashToUrl(hash)
+ if err == nil {
+ t.Errorf("expected error")
+ } else {
+ exp := "UrlHint address is not set"
+ if err.Error() != exp {
+ t.Errorf("incorrect error, expected '%v', got '%v'", exp, err.Error())
+ }
+ }
+
+ UrlHintAddr = common.BigToAddress(common.Big2).Hex() //[2:]
+ got, err = res.HashToUrl(hash)
+ if err == nil {
+ t.Errorf("expected error")
+ } else {
+ exp := "HashToUrl: URL hint not found for '" + hash.Hex() + "'"
+ if err.Error() != exp {
+ t.Errorf("incorrect error, expected '%v', got '%v'", exp, err.Error())
+ }
+ }
+
+ b.initUrlHint()
+ got, err = res.HashToUrl(hash)
if err != nil {
- t.Errorf("expected error, got %v", err)
+ t.Errorf("expected no error, got %v", err)
} else {
if got != url {
t.Errorf("incorrect result, expected '%v', got '%s'", url, got)