aboutsummaryrefslogtreecommitdiffstats
path: root/javascript
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-01-29 01:35:49 +0800
committerobscuren <geffobscura@gmail.com>2015-01-29 01:36:23 +0800
commit872b2497114209119becf2e8a4d4a5818e2084ee (patch)
treefa20b37eca386628f4b3bb54e248704d5b742b6f /javascript
parent1146f25015b6d84072b71c490aba246e3010bd87 (diff)
downloadgo-tangerine-872b2497114209119becf2e8a4d4a5818e2084ee.tar.gz
go-tangerine-872b2497114209119becf2e8a4d4a5818e2084ee.tar.zst
go-tangerine-872b2497114209119becf2e8a4d4a5818e2084ee.zip
further cleaned up xeth interface
Diffstat (limited to 'javascript')
-rw-r--r--javascript/javascript_runtime.go4
-rw-r--r--javascript/types.go18
2 files changed, 11 insertions, 11 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go
index adc9022b7..c780eb754 100644
--- a/javascript/javascript_runtime.go
+++ b/javascript/javascript_runtime.go
@@ -24,7 +24,7 @@ var jsrelogger = logger.NewLogger("JSRE")
type JSRE struct {
ethereum *eth.Ethereum
Vm *otto.Otto
- pipe *xeth.JSXEth
+ pipe *xeth.XEth
events event.Subscription
@@ -49,7 +49,7 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
re := &JSRE{
ethereum,
otto.New(),
- xeth.NewJSXEth(ethereum),
+ xeth.New(ethereum),
nil,
make(map[string][]otto.Value),
}
diff --git a/javascript/types.go b/javascript/types.go
index 3f30fa92b..7fb2082b9 100644
--- a/javascript/types.go
+++ b/javascript/types.go
@@ -12,14 +12,14 @@ import (
)
type JSStateObject struct {
- *xeth.JSObject
+ *xeth.Object
eth *JSEthereum
}
func (self *JSStateObject) EachStorage(call otto.FunctionCall) otto.Value {
cb := call.Argument(0)
- it := self.JSObject.Trie().Iterator()
+ it := self.Object.Trie().Iterator()
for it.Next() {
cb.Call(self.eth.toVal(self), self.eth.toVal(ethutil.Bytes2Hex(it.Key)), self.eth.toVal(ethutil.Bytes2Hex(it.Value)))
}
@@ -30,12 +30,12 @@ func (self *JSStateObject) EachStorage(call otto.FunctionCall) otto.Value {
// The JSEthereum object attempts to wrap the PEthereum object and returns
// meaningful javascript objects
type JSBlock struct {
- *xeth.JSBlock
+ *xeth.Block
eth *JSEthereum
}
func (self *JSBlock) GetTransaction(hash string) otto.Value {
- return self.eth.toVal(self.JSBlock.GetTransaction(hash))
+ return self.eth.toVal(self.Block.GetTransaction(hash))
}
type JSMessage struct {
@@ -67,27 +67,27 @@ func NewJSMessage(message *state.Message) JSMessage {
}
type JSEthereum struct {
- *xeth.JSXEth
+ *xeth.XEth
vm *otto.Otto
ethereum *eth.Ethereum
}
func (self *JSEthereum) Block(v interface{}) otto.Value {
if number, ok := v.(int64); ok {
- return self.toVal(&JSBlock{self.JSXEth.BlockByNumber(int32(number)), self})
+ return self.toVal(&JSBlock{self.XEth.BlockByNumber(int32(number)), self})
} else if hash, ok := v.(string); ok {
- return self.toVal(&JSBlock{self.JSXEth.BlockByHash(hash), self})
+ return self.toVal(&JSBlock{self.XEth.BlockByHash(hash), self})
}
return otto.UndefinedValue()
}
func (self *JSEthereum) GetStateObject(addr string) otto.Value {
- return self.toVal(&JSStateObject{xeth.NewJSObject(self.JSXEth.State().SafeGet(addr)), self})
+ return self.toVal(&JSStateObject{self.XEth.State().SafeGet(addr), self})
}
func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
- r, err := self.JSXEth.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
+ r, err := self.XEth.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
if err != nil {
fmt.Println(err)