From 49a912ce33274f60659ddb3af7e3fec89ee1b59e Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 26 Mar 2015 22:14:31 +0100
Subject: [PATCH] Undo xeth changes

---
 rpc/api.go       | 6 +++---
 rpc/args.go      | 8 ++++----
 rpc/args_test.go | 4 ++--
 xeth/xeth.go     | 7 ++-----
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/rpc/api.go b/rpc/api.go
index ad48b86078..4ae0ff668b 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -212,7 +212,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		args := new(HashIndexArgs)
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 		}
-		tx := api.xeth().EthTransactionByHash(args.Hash.Hex())
+		tx := api.xeth().EthTransactionByHash(args.Hash)
 		if tx != nil {
 			*reply = NewTransactionRes(tx)
 		}
@@ -257,7 +257,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		}
 
 		uhash := br.Uncles[args.Index].Hex()
-		uncle := NewBlockRes(api.xeth().EthBlockByHexstring(uhash))
+		uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash))
 
 		*reply = uncle
 	case "eth_getUncleByBlockNumberAndIndex":
@@ -275,7 +275,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		}
 
 		uhash := v.Uncles[args.Index].Hex()
-		uncle := NewBlockRes(api.xeth().EthBlockByHexstring(uhash))
+		uncle := NewBlockRes(api.xeth().EthBlockByHash(uhash))
 
 		*reply = uncle
 	case "eth_getCompilers":
diff --git a/rpc/args.go b/rpc/args.go
index 3637aff66d..19258263c5 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -61,7 +61,7 @@ func numString(raw interface{}, number *int64) error {
 }
 
 type GetBlockByHashArgs struct {
-	BlockHash  common.Hash
+	BlockHash  string
 	IncludeTxs bool
 }
 
@@ -80,7 +80,7 @@ func (args *GetBlockByHashArgs) UnmarshalJSON(b []byte) (err error) {
 	if !ok {
 		return NewInvalidTypeError("blockHash", "not a string")
 	}
-	args.BlockHash = common.HexToHash(argstr)
+	args.BlockHash = argstr
 
 	if len(obj) > 1 {
 		args.IncludeTxs = obj[1].(bool)
@@ -360,7 +360,7 @@ func (args *BlockNumIndexArgs) UnmarshalJSON(b []byte) (err error) {
 }
 
 type HashIndexArgs struct {
-	Hash  common.Hash
+	Hash  string
 	Index int64
 }
 
@@ -379,7 +379,7 @@ func (args *HashIndexArgs) UnmarshalJSON(b []byte) (err error) {
 	if !ok {
 		return NewInvalidTypeError("hash", "not a string")
 	}
-	args.Hash = common.HexToHash(arg0)
+	args.Hash = arg0
 
 	if len(obj) > 1 {
 		arg1, ok := obj[1].(string)
diff --git a/rpc/args_test.go b/rpc/args_test.go
index da98071e94..71f1a7058b 100644
--- a/rpc/args_test.go
+++ b/rpc/args_test.go
@@ -191,7 +191,7 @@ func TestGetBalanceArgsAddressInvalid(t *testing.T) {
 func TestGetBlockByHashArgs(t *testing.T) {
 	input := `["0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331", true]`
 	expected := new(GetBlockByHashArgs)
-	expected.BlockHash = common.HexToHash("0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331")
+	expected.BlockHash = "0xe670ec64341771606e55d6b4ca35a1a6b75ee3d5145a99d05921026d1527331"
 	expected.IncludeTxs = true
 
 	args := new(GetBlockByHashArgs)
@@ -1444,7 +1444,7 @@ func TestBlockNumIndexArgsIndexInvalid(t *testing.T) {
 func TestHashIndexArgs(t *testing.T) {
 	input := `["0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b", "0x1"]`
 	expected := new(HashIndexArgs)
-	expected.Hash = common.HexToHash("0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b")
+	expected.Hash = "0xc6ef2fc5426d6ad6fd9e2a26abeab0aa2411b7ab17f30a99d3cb96aed1d1055b"
 	expected.Index = 1
 
 	args := new(HashIndexArgs)
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 92e73c7d5c..bf30fc2fcc 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -160,16 +160,13 @@ func (self *XEth) BlockByHash(strHash string) *Block {
 	return NewBlock(block)
 }
 
-func (self *XEth) EthBlockByHash(hash common.Hash) *types.Block {
+func (self *XEth) EthBlockByHash(strHash string) *types.Block {
+	hash := common.HexToHash(strHash)
 	block := self.backend.ChainManager().GetBlock(hash)
 
 	return block
 }
 
-func (self *XEth) EthBlockByHexstring(strHash string) *types.Block {
-	return self.EthBlockByHash(common.HexToHash(strHash))
-}
-
 func (self *XEth) EthTransactionByHash(hash string) *types.Transaction {
 	data, _ := self.backend.ExtraDb().Get(common.FromHex(hash))
 	if len(data) != 0 {