From 093a9106b093310acf4c3911baa61916cff52ab8 Mon Sep 17 00:00:00 2001 From: zelig Date: Sun, 19 Apr 2015 19:24:46 +0100 Subject: [PATCH] contract addresses include hex prefix - 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 --- common/natspec/natspec.go | 2 +- common/natspec/natspec_e2e_test.go | 21 ++++++-------- common/resolver/resolver.go | 8 ++---- common/resolver/resolver_test.go | 44 +++++++++++++++++------------- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/common/natspec/natspec.go b/common/natspec/natspec.go index fb98d6ad96..38e7c1a9d0 100644 --- a/common/natspec/natspec.go +++ b/common/natspec/natspec.go @@ -195,7 +195,7 @@ func (self *NatSpec) Notice() (notice string, err error) { meth := self.makeAbi2method(abiKey) if meth == nil { - err = fmt.Errorf("abi key %x does not match any method %v") + err = fmt.Errorf("abi key does not match any method") return } notice, err = self.noticeForMethod(self.tx, meth.name, meth.Notice) diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go index 30e6e87dc1..147abe162b 100644 --- a/common/natspec/natspec_e2e_test.go +++ b/common/natspec/natspec_e2e_test.go @@ -1,7 +1,6 @@ package natspec import ( - "fmt" "io/ioutil" "math/big" "os" @@ -40,7 +39,7 @@ const testFileName = "long_file_name_for_testing_registration_of_URLs_longer_tha const testNotice = "Register key `utils.toHex(_key)` <- content `utils.toHex(_content)`" const testExpNotice = "Register key 0xadd1a7d961cff0242089674ec2ef6fca671ab15e1fe80e38859fc815b98d88ab <- content 0xc00d5bcc872e17813df6ec5c646bb281a6e2d3b454c2c400c78192adf3344af9" -const testExpNotice2 = `About to submit transaction (NatSpec notice error "abi key %!x(MISSING) does not match any method %!v(MISSING)"): {"id":6,"jsonrpc":"2.0","method":"eth_transact","params":[{"from":"0xe273f01c99144c438695e10f24926dc1f9fbf62d","to":"0xb737b91f8e95cf756766fc7c62c9a8ff58470381","value":"100000000000","gas":"100000","gasPrice":"100000","data":"0x31e12c20"}]}` +const testExpNotice2 = `About to submit transaction (NatSpec notice error "abi key does not match any method"): {"id":6,"jsonrpc":"2.0","method":"eth_transact","params":[{"from":"0xe273f01c99144c438695e10f24926dc1f9fbf62d","to":"0xb737b91f8e95cf756766fc7c62c9a8ff58470381","value":"100000000000","gas":"100000","gasPrice":"100000","data":"0x31e12c20"}]}` const testExpNotice3 = `About to submit transaction (no NatSpec info found for contract): {"id":6,"jsonrpc":"2.0","method":"eth_transact","params":[{"from":"0xe273f01c99144c438695e10f24926dc1f9fbf62d","to":"0x8b839ad85686967a4f418eccc81962eaee314ac3","value":"100000000000","gas":"100000","gasPrice":"100000","data":"0x300a3bbfc00d5bcc872e17813df6ec5c646bb281a6e2d3b454c2c400c78192adf3344af900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"}]}` const testUserDoc = ` @@ -106,27 +105,25 @@ func (f *testFrontend) ConfirmTransaction(tx string) bool { var port = 30300 func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) { - os.RemoveAll("/tmp/eth/") - err = os.MkdirAll("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/", os.ModePerm) + os.RemoveAll("/tmp/eth-natspec/") + err = os.MkdirAll("/tmp/eth-natspec/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/", os.ModePerm) if err != nil { t.Errorf("%v", err) return } - err = os.MkdirAll("/tmp/eth/data", os.ModePerm) + err = os.MkdirAll("/tmp/eth-natspec/data", os.ModePerm) if err != nil { t.Errorf("%v", err) return } - ks := crypto.NewKeyStorePlain("/tmp/eth/keys") - ioutil.WriteFile("/tmp/eth/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", + ks := crypto.NewKeyStorePlain("/tmp/eth-natspec/keys") + ioutil.WriteFile("/tmp/eth-natspec/keys/e273f01c99144c438695e10f24926dc1f9fbf62d/e273f01c99144c438695e10f24926dc1f9fbf62d", []byte(`{"Id":"RhRXD+fNRKS4jx+7ZfEsNA==","Address":"4nPwHJkUTEOGleEPJJJtwfn79i0=","PrivateKey":"h4ACVpe74uIvi5Cg/2tX/Yrm2xdr3J7QoMbMtNX2CNc="}`), os.ModePerm) port++ ethereum, err = eth.New(ð.Config{ - DataDir: "/tmp/eth", + DataDir: "/tmp/eth-natspec", AccountManager: accounts.NewManager(ks), - Port: fmt.Sprintf("%d", port), - MaxPeers: 10, Name: "test", }) @@ -146,7 +143,7 @@ func testInit(t *testing.T) (self *testFrontend) { ethereum, err := testEth(t) if err != nil { - t.Errorf("error creating jsre, got %v", err) + t.Errorf("error creating ethereum: %v", err) return } err = ethereum.Start() @@ -193,7 +190,7 @@ func (self *testFrontend) insertTx(addr, contract, fnsig string, args []string) jsontx := ` [{ "from": "` + addr + `", - "to": "0x` + contract + `", + "to": "` + contract + `", "value": "100000000000", "gas": "100000", "gasPrice": "100000", diff --git a/common/resolver/resolver.go b/common/resolver/resolver.go index 35f765349b..1e6d03ffb4 100644 --- a/common/resolver/resolver.go +++ b/common/resolver/resolver.go @@ -32,8 +32,6 @@ func CreateContracts(xeth *xe.XEth, addr string) { if err != nil { panic(err) } - URLHintContractAddress = URLHintContractAddress[2:] - HashRegContractAddress = HashRegContractAddress[2:] } type Resolver struct { @@ -53,7 +51,7 @@ func New(eth Backend, uhca, nrca string) *Resolver { func (self *Resolver) KeyToContentHash(khash common.Hash) (chash common.Hash, err error) { // look up in hashReg key := storageAddress(storageMapping(storageIdx2Addr(1), khash[:])) - hash := self.backend.StorageAt("0x"+self.hashRegContractAddress, key) + hash := self.backend.StorageAt(self.hashRegContractAddress, key) if hash == "0x0" || len(hash) < 3 { err = fmt.Errorf("GetHashReg: content hash not found") @@ -71,7 +69,7 @@ func (self *Resolver) ContentHashToUrl(chash common.Hash) (uri string, err error for len(str) > 0 { mapaddr := storageMapping(storageIdx2Addr(1), chash[:]) key := storageAddress(storageFixedArray(mapaddr, storageIdx2Addr(idx))) - hex := self.backend.StorageAt("0x"+self.urlHintContractAddress, key) + hex := self.backend.StorageAt(self.urlHintContractAddress, key) str = string(common.Hex2Bytes(hex[2:])) l := len(str) for (l > 0) && (str[l-1] == 0) { @@ -126,5 +124,5 @@ func storageFixedArray(addr, idx []byte) []byte { } func storageAddress(addr []byte) string { - return "0x" + common.Bytes2Hex(addr) + return common.ToHex(addr) } diff --git a/common/resolver/resolver_test.go b/common/resolver/resolver_test.go index a67b9ad04b..f5eb514370 100644 --- a/common/resolver/resolver_test.go +++ b/common/resolver/resolver_test.go @@ -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)) + } + } }