added batch support to console and attach actions
This commit is contained in:
committed by
Bas van Kervel
parent
3ff272b618
commit
f87501b1c5
@ -3,12 +3,13 @@ package api
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||
"encoding/json"
|
||||
"strconv"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common/compiler"
|
||||
"github.com/ethereum/go-ethereum/rpc/shared"
|
||||
"github.com/ethereum/go-ethereum/eth"
|
||||
"github.com/ethereum/go-ethereum/rpc/codec"
|
||||
"github.com/ethereum/go-ethereum/rpc/shared"
|
||||
"github.com/ethereum/go-ethereum/xeth"
|
||||
)
|
||||
|
||||
@ -58,11 +59,11 @@ func TestCompileSolidity(t *testing.T) {
|
||||
t.Skip("WARNING: skipping test because of solc different version (%v, test written for %v, may need to update)", solc.Version(), solcVersion)
|
||||
}
|
||||
source := `contract test {\n` +
|
||||
" /// @notice Will multiply `a` by 7." + `\n` +
|
||||
` function multiply(uint a) returns(uint d) {\n` +
|
||||
` return a * 7;\n` +
|
||||
` }\n` +
|
||||
`}\n`
|
||||
" /// @notice Will multiply `a` by 7." + `\n` +
|
||||
` function multiply(uint a) returns(uint d) {\n` +
|
||||
` return a * 7;\n` +
|
||||
` }\n` +
|
||||
`}\n`
|
||||
|
||||
jsonstr := `{"jsonrpc":"2.0","method":"eth_compileSolidity","params":["` + source + `"],"id":64}`
|
||||
|
||||
|
@ -250,7 +250,6 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
|
||||
return v, nil
|
||||
}
|
||||
|
||||
|
||||
func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) {
|
||||
args := new(NewDataArgs)
|
||||
if err := self.codec.Decode(req.Params, &args); err != nil {
|
||||
|
@ -227,32 +227,32 @@ func (args *GetDataArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
}
|
||||
|
||||
type NewDataArgs struct {
|
||||
Data string
|
||||
Data string
|
||||
}
|
||||
|
||||
func (args *NewDataArgs) UnmarshalJSON(b []byte) (err error) {
|
||||
var obj []interface{}
|
||||
var obj []interface{}
|
||||
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return shared.NewDecodeParamError(err.Error())
|
||||
}
|
||||
if err := json.Unmarshal(b, &obj); err != nil {
|
||||
return shared.NewDecodeParamError(err.Error())
|
||||
}
|
||||
|
||||
// Check for sufficient params
|
||||
if len(obj) < 1 {
|
||||
return shared.NewInsufficientParamsError(len(obj), 1)
|
||||
}
|
||||
// Check for sufficient params
|
||||
if len(obj) < 1 {
|
||||
return shared.NewInsufficientParamsError(len(obj), 1)
|
||||
}
|
||||
|
||||
data, ok := obj[0].(string)
|
||||
if !ok {
|
||||
return shared.NewInvalidTypeError("data", "not a string")
|
||||
}
|
||||
args.Data = data
|
||||
data, ok := obj[0].(string)
|
||||
if !ok {
|
||||
return shared.NewInvalidTypeError("data", "not a string")
|
||||
}
|
||||
args.Data = data
|
||||
|
||||
if len(args.Data) == 0 {
|
||||
return shared.NewValidationError("data", "is required")
|
||||
}
|
||||
if len(args.Data) == 0 {
|
||||
return shared.NewValidationError("data", "is required")
|
||||
}
|
||||
|
||||
return nil
|
||||
return nil
|
||||
}
|
||||
|
||||
type NewSigArgs struct {
|
||||
|
Reference in New Issue
Block a user