Skip to content

P
plugin
Commit 7d840b68 authored by mdj33's avatar mdj33 Committed by vipwzw
Browse files
Options

fix conflict

parent b2b62fd4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
plugin/dapp/paracross/rpc/rpc.go
View file @ 7d840b68
...@@ -227,7 +227,9 @@ func (c *Jrpc) GetNodeAddrStatus(req *pt.ReqParacrossNodeInfo, result *interface ...@@ -227,7 +227,9 @@ func (c *Jrpc) GetNodeAddrStatus(req *pt.ReqParacrossNodeInfo, result *interface
} }
data, err := c.cli.GetNodeAddrStatus(context.Background(), req) data, err := c.cli.GetNodeAddrStatus(context.Background(), req)
if err != nil{
return err
}
*result = data *result = data
return err return err
} }
...@@ -239,7 +241,9 @@ func (c *Jrpc) GetNodeIDStatus(req *pt.ReqParacrossNodeInfo, result *interface{} ...@@ -239,7 +241,9 @@ func (c *Jrpc) GetNodeIDStatus(req *pt.ReqParacrossNodeInfo, result *interface{}
} }
data, err := c.cli.GetNodeIDStatus(context.Background(), req) data, err := c.cli.GetNodeIDStatus(context.Background(), req)
if err != nil{
return err
}
*result = data *result = data
return err return err
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment