From 3136bae4a5f08820d3116b61b783c100c169717c Mon Sep 17 00:00:00 2001 From: zsfelfoldi Date: Tue, 31 Mar 2015 08:28:12 +0200 Subject: NatSpec, URL register storage retrieval fixed 2/3 tests --- rpc/api.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'rpc/api.go') diff --git a/rpc/api.go b/rpc/api.go index bf5066f9a..c02b03fb6 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -2,7 +2,7 @@ package rpc import ( "encoding/json" - // "fmt" + "fmt" "math/big" "sync" @@ -167,6 +167,15 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err return err } + // call ConfirmTransaction first + var obj []json.RawMessage + if err := json.Unmarshal(req.Params, &obj); err != nil { + return NewDecodeParamError(err.Error()) + } + if !api.xeth().ConfirmTransaction(string(obj[0])) { + return fmt.Errorf("Transaction not confirmed") + } + v, err := api.xeth().Transact(args.From, args.To, args.Value.String(), args.Gas.String(), args.GasPrice.String(), args.Data) if err != nil { return err -- cgit v1.2.3 From b635cad9fe127e6b0ca6d993ce9a3b6c61ce79c6 Mon Sep 17 00:00:00 2001 From: zsfelfoldi Date: Tue, 7 Apr 2015 11:50:17 +0200 Subject: NatSpec passing end to end test --- rpc/api.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'rpc/api.go') diff --git a/rpc/api.go b/rpc/api.go index c02b03fb6..66283752b 100644 --- a/rpc/api.go +++ b/rpc/api.go @@ -168,11 +168,8 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err } // call ConfirmTransaction first - var obj []json.RawMessage - if err := json.Unmarshal(req.Params, &obj); err != nil { - return NewDecodeParamError(err.Error()) - } - if !api.xeth().ConfirmTransaction(string(obj[0])) { + tx, _ := json.Marshal(req) + if !api.xeth().ConfirmTransaction(string(tx)) { return fmt.Errorf("Transaction not confirmed") } -- cgit v1.2.3