Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

1 files changed, 46 insertions, 0 deletions

diff --git a/rpc/api_test.go b/rpc/api_test.go
index 727ade007..a00c2f3f1 100644
--- a/rpc/api_test.go
+++ b/rpc/api_test.go
@@ -5,6 +5,8 @@ import (
 	// "sync"
 	"testing"
 	// "time"
+
+	"github.com/ethereum/go-ethereum/xeth"
 )
 
 func TestWeb3Sha3(t *testing.T) {
@@ -24,6 +26,50 @@ func TestWeb3Sha3(t *testing.T) {
 	}
 }
 
+func TestDbStr(t *testing.T) {
+	jsonput := `{"jsonrpc":"2.0","method":"db_putString","params":["testDB","myKey","myString"],"id":64}`
+	jsonget := `{"jsonrpc":"2.0","method":"db_getString","params":["testDB","myKey"],"id":64}`
+	expected := "myString"
+
+	xeth := &xeth.XEth{}
+	api := NewEthereumApi(xeth, "")
+	defer api.db.Close()
+	var response interface{}
+
+	var req RpcRequest
+	json.Unmarshal([]byte(jsonput), &req)
+	_ = api.GetRequestReply(&req, &response)
+
+	json.Unmarshal([]byte(jsonget), &req)
+	_ = api.GetRequestReply(&req, &response)
+
+	if response.(string) != expected {
+		t.Errorf("Expected %s got %s", expected, response)
+	}
+}
+
+func TestDbHexStr(t *testing.T) {
+	jsonput := `{"jsonrpc":"2.0","method":"db_putHex","params":["testDB","beefKey","0xbeef"],"id":64}`
+	jsonget := `{"jsonrpc":"2.0","method":"db_getHex","params":["testDB","beefKey"],"id":64}`
+	expected := "0xbeef"
+
+	xeth := &xeth.XEth{}
+	api := NewEthereumApi(xeth, "")
+	defer api.db.Close()
+	var response interface{}
+
+	var req RpcRequest
+	json.Unmarshal([]byte(jsonput), &req)
+	_ = api.GetRequestReply(&req, &response)
+
+	json.Unmarshal([]byte(jsonget), &req)
+	_ = api.GetRequestReply(&req, &response)
+
+	if response.(string) != expected {
+		t.Errorf("Expected %s got %s", expected, response)
+	}
+}
+
 // func TestFilterClose(t *testing.T) {
 // 	t.Skip()
 // 	api := &EthereumApi{