diff options
| author | zelig <viktor.tron@gmail.com> | 2015-06-23 22:48:33 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-07 16:43:31 +0800 |
| commit | 27392337198b9287e9f6fe615510a1f30099e3d7 (patch) | |
| tree | f1136c71d2af0e72dbf41621b161dbaff019aad9 /cmd/geth | |
| parent | 83ee39448e0f23d42dff27bccde27f828afa3707 (diff) | |
| download | dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar.gz dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar.bz2 dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar.lz dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar.xz dexon-27392337198b9287e9f6fe615510a1f30099e3d7.tar.zst dexon-27392337198b9287e9f6fe615510a1f30099e3d7.zip | |
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
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/js.go | 2 | ||||
| -rw-r--r-- | cmd/geth/js_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 5a5dd75f3..06c923913 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -145,6 +145,7 @@ func newLightweightJSRE(libPath string, client comms.EthereumClient, interactive js := &jsre{ps1: "> "} js.wait = make(chan *big.Int) js.client = client + js.ds = docserver.New("/") if f == nil { f = js @@ -335,7 +336,6 @@ func (js *jsre) apiBindings(f xeth.Frontend) error { } js.re.Eval(`var GlobalRegistrar = eth.contract(` + registrar.GlobalRegistrarAbi + `); registrar = GlobalRegistrar.at("` + registrar.GlobalRegistrarAddr + `");`) - return nil } diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 0b7045ff6..91b927dd3 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -254,7 +254,7 @@ func TestSignature(t *testing.T) { } func TestContract(t *testing.T) { - // t.Skip("contract testing is implemented with mining in ethash test mode. This takes about 7seconds to run. Unskip and run on demand") + t.Skip("contract testing is implemented with mining in ethash test mode. This takes about 7seconds to run. Unskip and run on demand") tmp, repl, ethereum := testJEthRE(t) if err := ethereum.Start(); err != nil { t.Errorf("error starting ethereum: %v", err) |