diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-07 04:54:21 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-07 04:54:21 +0800 |
| commit | 062fa049d0322f17f8ba831203a609d048f623f1 (patch) | |
| tree | 1600884f30471066b9f54cc26c2a9e95b9b20989 /cmd | |
| parent | 24d44f35f2cf17b07330a7e7be79abc2b6b92fc6 (diff) | |
| parent | 4accc187d5cf6a100d6c10c0e0f35780f52871a0 (diff) | |
| download | go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.gz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.bz2 go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.lz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.xz go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.tar.zst go-tangerine-062fa049d0322f17f8ba831203a609d048f623f1.zip | |
fixed merge issue
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/admin.go | 6 | ||||
| -rw-r--r-- | cmd/mist/ui_lib.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index e7cc96ddb..f15ce89a0 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -32,7 +32,7 @@ func (js *jsre) adminBindings() { js.re.Set("admin", struct{}{}) t, _ := js.re.Get("admin") admin := t.Object() - admin.Set("suggestPeer", js.suggestPeer) + admin.Set("addPeer", js.addPeer) admin.Set("startRPC", js.startRPC) admin.Set("stopRPC", js.stopRPC) admin.Set("nodeInfo", js.nodeInfo) @@ -314,13 +314,13 @@ func (js *jsre) stopRPC(call otto.FunctionCall) otto.Value { return otto.FalseValue() } -func (js *jsre) suggestPeer(call otto.FunctionCall) otto.Value { +func (js *jsre) addPeer(call otto.FunctionCall) otto.Value { nodeURL, err := call.Argument(0).ToString() if err != nil { fmt.Println(err) return otto.FalseValue() } - err = js.ethereum.SuggestPeer(nodeURL) + err = js.ethereum.AddPeer(nodeURL) if err != nil { fmt.Println(err) return otto.FalseValue() diff --git a/cmd/mist/ui_lib.go b/cmd/mist/ui_lib.go index 2de71491c..a604e87ba 100644 --- a/cmd/mist/ui_lib.go +++ b/cmd/mist/ui_lib.go @@ -104,8 +104,8 @@ func (ui *UiLib) Connect(button qml.Object) { } func (ui *UiLib) ConnectToPeer(nodeURL string) { - if err := ui.eth.SuggestPeer(nodeURL); err != nil { - guilogger.Infoln("SuggestPeer error: " + err.Error()) + if err := ui.eth.AddPeer(nodeURL); err != nil { + guilogger.Infoln("AddPeer error: " + err.Error()) } } |