From cc9ae399338557b6671e8fc83bb696c5ddb068fe Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Tue, 9 Jun 2015 16:06:51 +0200
Subject: added admin API

---
 rpc/api/admin_args.go | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 rpc/api/admin_args.go

(limited to 'rpc/api/admin_args.go')

diff --git a/rpc/api/admin_args.go b/rpc/api/admin_args.go
new file mode 100644
index 000000000..9c0cbdcb6
--- /dev/null
+++ b/rpc/api/admin_args.go
@@ -0,0 +1,107 @@
+package api
+
+import (
+	"encoding/json"
+
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/rpc/shared"
+)
+
+type AddPeerArgs struct {
+	Url string
+}
+
+func (args *AddPeerArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+
+	if len(obj) != 1 {
+		return shared.NewDecodeParamError("Expected enode as argument")
+	}
+
+	urlstr, ok := obj[0].(string)
+	if !ok {
+		return shared.NewInvalidTypeError("url", "not a string")
+	}
+	args.Url = urlstr
+
+	return nil
+}
+
+type ImportExportChainArgs struct {
+	Filename string
+}
+
+func (args *ImportExportChainArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+
+	if len(obj) != 1 {
+		return shared.NewDecodeParamError("Expected filename as argument")
+	}
+
+	filename, ok := obj[0].(string)
+	if !ok {
+		return shared.NewInvalidTypeError("filename", "not a string")
+	}
+	args.Filename = filename
+
+	return nil
+}
+
+type VerbosityArgs struct {
+	Level int
+}
+
+func (args *VerbosityArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+
+	if len(obj) != 1 {
+		return shared.NewDecodeParamError("Expected enode as argument")
+	}
+
+	if levelint, ok := obj[0].(int); ok {
+		args.Level = levelint
+	} else if levelstr, ok := obj[0].(string); ok {
+		if !ok {
+			return shared.NewInvalidTypeError("level", "not a string")
+		}
+		level, success := new(big.Int).SetString(levelstr, 0)
+		if !success {
+			return shared.NewDecodeParamError("Unable to parse verbosity level")
+		}
+		args.Level = int(level.Int64())
+	}
+
+	return nil
+}
+
+type SetSolcArgs struct {
+	Path string
+}
+
+func (args *SetSolcArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []interface{}
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return shared.NewDecodeParamError(err.Error())
+	}
+
+	if len(obj) != 1 {
+		return shared.NewDecodeParamError("Expected path as argument")
+	}
+
+	if pathstr, ok := obj[0].(string); ok {
+		args.Path = pathstr
+		return nil
+	}
+
+	return shared.NewInvalidTypeError("path", "not a string")
+}
-- 
cgit v1.2.3


From bd38428f33b127e9c60d26127695e50c55798fcd Mon Sep 17 00:00:00 2001
From: Bas van Kervel <bas@ethdev.com>
Date: Wed, 10 Jun 2015 11:29:52 +0200
Subject: cleanup of javascript API

---
 rpc/api/admin_args.go | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'rpc/api/admin_args.go')

diff --git a/rpc/api/admin_args.go b/rpc/api/admin_args.go
index 9c0cbdcb6..56bb57e20 100644
--- a/rpc/api/admin_args.go
+++ b/rpc/api/admin_args.go
@@ -3,8 +3,6 @@ package api
 import (
 	"encoding/json"
 
-	"math/big"
-
 	"github.com/ethereum/go-ethereum/rpc/shared"
 )
 
@@ -68,16 +66,8 @@ func (args *VerbosityArgs) UnmarshalJSON(b []byte) (err error) {
 		return shared.NewDecodeParamError("Expected enode as argument")
 	}
 
-	if levelint, ok := obj[0].(int); ok {
-		args.Level = levelint
-	} else if levelstr, ok := obj[0].(string); ok {
-		if !ok {
-			return shared.NewInvalidTypeError("level", "not a string")
-		}
-		level, success := new(big.Int).SetString(levelstr, 0)
-		if !success {
-			return shared.NewDecodeParamError("Unable to parse verbosity level")
-		}
+	level, err := numString(obj[0])
+	if err == nil {
 		args.Level = int(level.Int64())
 	}
 
-- 
cgit v1.2.3