Merge branch 'jsonrpc' into qt5.4

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 2da4a76f8..2ee5b39ba 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 JSLog struct {
@@ -55,27 +55,27 @@ func NewJSLog(log state.Log) JSLog {
 }
 
 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)