gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

contract addresses include hex prefix

Browse Source 
- simplify resolver and tests
- added missing test for KeyToUrl
- fix notice error message and its test with !%x(MISSING)
- natspec test: insertTx modified - does not prepend 0x to contract address
- disable networking in e2e test
This commit is contained in:
zelig
2015-04-19 19:24:46 +01:00
parent 71c974f3eb
commit 093a9106b0
4 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
common/resolver/resolver_test.go
View File

@ -14,8 +14,8 @@ type testBackend struct {
var (
text = "test"
codehash = "1234" //common.RightPadString("1234", 64)
hash = common.Bytes2Hex(crypto.Sha3([]byte(text)))
codehash = common.StringToHash("1234")
hash = common.BytesToHash(crypto.Sha3([]byte(text)))
url = "bzz://bzzhash/my/path/contr.act"
)
@ -23,17 +23,17 @@ func NewTestBackend() *testBackend {
self := &testBackend{}
self.contracts = make(map[string](map[string]string))
self.contracts["0x"+HashRegContractAddress] = make(map[string]string)
key := storageAddress(storageMapping(storageIdx2Addr(1), common.Hex2BytesFixed(codehash, 32)))
self.contracts["0x"+HashRegContractAddress][key] = "0x" + hash
self.contracts[HashRegContractAddress] = make(map[string]string)
key := storageAddress(storageMapping(storageIdx2Addr(1), codehash[:]))
self.contracts[HashRegContractAddress][key] = hash.Hex()
self.contracts["0x"+URLHintContractAddress] = make(map[string]string)
mapaddr := storageMapping(storageIdx2Addr(1), common.Hex2BytesFixed(hash, 32))
self.contracts[URLHintContractAddress] = make(map[string]string)
mapaddr := storageMapping(storageIdx2Addr(1), hash[:])
key = storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(0)))
self.contracts["0x"+URLHintContractAddress][key] = "0x" + common.Bytes2Hex([]byte(url))
self.contracts[URLHintContractAddress][key] = common.ToHex([]byte(url))
key = storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(1)))
self.contracts["0x"+URLHintContractAddress][key] = "0x00"
self.contracts[URLHintContractAddress][key] = "0x00"
return self
}
@ -50,15 +50,13 @@ func (self *testBackend) StorageAt(ca, sa string) (res string) {
func TestKeyToContentHash(t *testing.T) {
b := NewTestBackend()
res := New(b, URLHintContractAddress, HashRegContractAddress)
chash := common.Hash{}
copy(chash[:], common.Hex2BytesFixed(codehash, 32))
got, err := res.KeyToContentHash(chash)
got, err := res.KeyToContentHash(codehash)
if err != nil {
t.Errorf("expected no error, got %v", err)
} else {
if common.Bytes2Hex(got[:]) != hash {
t.Errorf("incorrect result, expected %x, got %x: ", hash, common.Bytes2Hex(got[:]))
if got != hash {
t.Errorf("incorrect result, expected %x, got %x: ", hash.Hex(), got.Hex())
}
}
}
@ -66,17 +64,25 @@ func TestKeyToContentHash(t *testing.T) {
func TestContentHashToUrl(t *testing.T) {
b := NewTestBackend()
res := New(b, URLHintContractAddress, HashRegContractAddress)
chash := common.Hash{}
copy(chash[:], common.Hex2BytesFixed(hash, 32))
got, err := res.ContentHashToUrl(chash)
got, err := res.ContentHashToUrl(hash)
if err != nil {
t.Errorf("expected no error, got %v", err)
} else {
if string(got[:]) != url {
t.Errorf("incorrect result, expected %v, got %s: ", url, string(got[:]))
if string(got) != url {
t.Errorf("incorrect result, expected %v, got %s: ", url, string(got))
}
}
}
func TestKeyToUrl(t *testing.T) {
b := NewTestBackend()
res := New(b, URLHintContractAddress, HashRegContractAddress)
got, _, err := res.KeyToUrl(codehash)
if err != nil {
t.Errorf("expected no error, got %v", err)
} else {
if string(got) != url {
t.Errorf("incorrect result, expected %v, got %s: ", url, string(got))
}
}
}