From 68b0d30d4ad81cfd656a6063baa034cfd9e36ec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 30 May 2018 11:04:45 +0300 Subject: [PATCH 1/3] VERSION, params: begin 1.8.11 release cycle --- VERSION | 2 +- params/version.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index d9a03a9e5a..267637b120 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.10 +1.8.11 diff --git a/params/version.go b/params/version.go index e38c23293a..8689ccba7f 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 8 // Minor version component of the current release - VersionPatch = 10 // Patch version component of the current release - VersionMeta = "stable" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 8 // Minor version component of the current release + VersionPatch = 11 // Patch version component of the current release + VersionMeta = "unstable" // Version metadata to append to the version string ) // Version holds the textual version string. From 0ad32d3be70ca27044b56b5eee9c1b3bd38e2d69 Mon Sep 17 00:00:00 2001 From: kiel barry Date: Wed, 30 May 2018 01:36:02 -0700 Subject: [PATCH 2/3] ethstats: fix last golint warning (#16837) --- ethstats/ethstats.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index c116014351..a4d35044cd 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -362,7 +362,7 @@ type nodeInfo struct { // authMsg is the authentication infos needed to login to a monitoring server. type authMsg struct { - Id string `json:"id"` + ID string `json:"id"` Info nodeInfo `json:"info"` Secret string `json:"secret"` } @@ -381,7 +381,7 @@ func (s *Service) login(conn *websocket.Conn) error { protocol = fmt.Sprintf("les/%d", les.ClientProtocolVersions[0]) } auth := &authMsg{ - Id: s.node, + ID: s.node, Info: nodeInfo{ Name: s.node, Node: infos.Name, From af28d12847c4572c7c3d9f5775db9b18bcfc3889 Mon Sep 17 00:00:00 2001 From: kiel barry Date: Thu, 31 May 2018 04:59:08 -0700 Subject: [PATCH 3/3] console: squash golint warnings (#16836) --- console/bridge.go | 4 ++-- console/console.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/console/bridge.go b/console/bridge.go index f2120351c0..b0b4d37985 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -271,7 +271,7 @@ func (b *bridge) SleepBlocks(call otto.FunctionCall) (response otto.Value) { } type jsonrpcCall struct { - Id int64 + ID int64 Method string Params []interface{} } @@ -304,7 +304,7 @@ func (b *bridge) Send(call otto.FunctionCall) (response otto.Value) { resps, _ := call.Otto.Object("new Array()") for _, req := range reqs { resp, _ := call.Otto.Object(`({"jsonrpc":"2.0"})`) - resp.Set("id", req.Id) + resp.Set("id", req.ID) var result json.RawMessage err = b.client.Call(&result, req.Method, req.Params...) switch err := err.(type) { diff --git a/console/console.go b/console/console.go index b280d4e65d..1bceb7bc65 100644 --- a/console/console.go +++ b/console/console.go @@ -73,6 +73,8 @@ type Console struct { printer io.Writer // Output writer to serialize any display strings to } +// New initializes a JavaScript interpreted runtime environment and sets defaults +// with the config struct. func New(config Config) (*Console, error) { // Handle unset config values gracefully if config.Prompter == nil {