Skip to content

G
Geth-Modification
Commit d7dabce7 authored by zsfelfoldi's avatar zsfelfoldi
Browse files
Options

ToVal serialization fix

parent 1de1359e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
jsre/jsre.go
View file @ d7dabce7
...@@ -297,7 +297,7 @@ func (self *JSRE) PrettyPrint(v interface{}) (val otto.Value, err error) { ...@@ -297,7 +297,7 @@ func (self *JSRE) PrettyPrint(v interface{}) (val otto.Value, err error) {
return method.Call(method, v) return method.Call(method, v)
} }
// creates an otto value from a go type // creates an otto value from a go type (serialized version)
func (self *JSRE) ToValue(v interface{}) (otto.Value, error) { func (self *JSRE) ToValue(v interface{}) (otto.Value, error) {
done := make(chan bool) done := make(chan bool)
req := &evalReq{ req := &evalReq{
...@@ -311,9 +311,10 @@ func (self *JSRE) ToValue(v interface{}) (otto.Value, error) { ...@@ -311,9 +311,10 @@ func (self *JSRE) ToValue(v interface{}) (otto.Value, error) {
return req.res.result, req.res.err return req.res.result, req.res.err
} }
// creates an otto value from a go type (non-serialized version)
func (self *JSRE) ToVal(v interface{}) otto.Value { func (self *JSRE) ToVal(v interface{}) otto.Value {
result, err := self.ToValue(v) result, err := self.vm.ToValue(v)
if err != nil { if err != nil {
fmt.Println("Value unknown:", err) fmt.Println("Value unknown:", err)
return otto.UndefinedValue() return otto.UndefinedValue()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment