aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-04-01 19:29:16 +0800
committerzelig <viktor.tron@gmail.com>2015-04-20 03:57:49 +0800
commitac0e5e8b6de43a40bbc25f541aa2399202bbe420 (patch)
tree1f17675caec7ef387d19d6da167c13cd26eb4845 /cmd
parent3a540425a3d7fc29233b5cd3e7b79b4866f35d57 (diff)
downloaddexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar.gz
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar.bz2
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar.lz
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar.xz
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.tar.zst
dexon-ac0e5e8b6de43a40bbc25f541aa2399202bbe420.zip
resolver tests
- add resolver tests and fix resolver to pass - statereg constructor fixed - comments added to natspec plus docserver integration for natspec userdoc fetching
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/js.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index d63ac1015..9931b3a21 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -25,6 +25,7 @@ import (
"strings"
"github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/common/docserver"
"github.com/ethereum/go-ethereum/common/natspec"
"github.com/ethereum/go-ethereum/eth"
re "github.com/ethereum/go-ethereum/jsre"
@@ -139,9 +140,11 @@ var net = web3.net;
js.re.Eval(globalRegistrar + "registrar = new GlobalRegistrar(\"" + globalRegistrarAddr + "\");")
}
+var ds, _ = docserver.New(utils.JSpathFlag.String())
+
func (self *jsre) ConfirmTransaction(tx string) bool {
var notice string
- nat, err := natspec.New(self.xeth, tx)
+ nat, err := natspec.New(self.xeth, tx, ds)
if err == nil {
notice, err = nat.Notice()
}