fix conflict

7d840b68 · mdj33 · vipwzw · b2b62fd4 · 7d840b68
Commit 7d840b68 authored Jun 05, 2019 by mdj33 Committed by vipwzw Jun 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

rpc.go plugin/dapp/paracross/rpc/rpc.go +6 -2

No files found.
--- a/plugin/dapp/paracross/rpc/rpc.go
+++ b/plugin/dapp/paracross/rpc/rpc.go
@@ -227,7 +227,9 @@ func (c *Jrpc) GetNodeAddrStatus(req *pt.ReqParacrossNodeInfo, result *interface
 	}

 	data, err := c.cli.GetNodeAddrStatus(context.Background(), req)
-
+	if err != nil{
+		return err
+	}
 	*result = data
 	return err
 }
@@ -239,7 +241,9 @@ func (c *Jrpc) GetNodeIDStatus(req *pt.ReqParacrossNodeInfo, result *interface{}
 	}

 	data, err := c.cli.GetNodeIDStatus(context.Background(), req)
-
+	if err != nil{
+		return err
+	}
 	*result = data
 	return err
 }