Commit b94a1abd authored by vipwzw's avatar vipwzw

auto ci

parent e010ff88
...@@ -8,11 +8,11 @@ import ( ...@@ -8,11 +8,11 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"github.com/33cn/chain33/common"
dbm "github.com/33cn/chain33/common/db" dbm "github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types" "github.com/33cn/chain33/types"
pt "github.com/33cn/plugin/plugin/dapp/paracross/types" pt "github.com/33cn/plugin/plugin/dapp/paracross/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/33cn/chain33/common"
) )
// Query_GetTitle query paracross title // Query_GetTitle query paracross title
...@@ -28,24 +28,24 @@ func (p *Paracross) Query_GetTitleHeight(in *pt.ReqParacrossTitleHeight) (types. ...@@ -28,24 +28,24 @@ func (p *Paracross) Query_GetTitleHeight(in *pt.ReqParacrossTitleHeight) (types.
if in == nil { if in == nil {
return nil, types.ErrInvalidParam return nil, types.ErrInvalidParam
} }
stat,err:= p.paracrossGetStateTitleHeight(in.Title,in.Height) stat, err := p.paracrossGetStateTitleHeight(in.Title, in.Height)
if err != nil { if err != nil {
clog.Error("paracross.GetTitleHeight", "title", title, "height", in.Height, "err", err.Error()) clog.Error("paracross.GetTitleHeight", "title", title, "height", in.Height, "err", err.Error())
return nil,err return nil, err
} }
status := stat.(*pt.ParacrossHeightStatus) status := stat.(*pt.ParacrossHeightStatus)
res := &pt.ParacrossHeightStatusRsp{ res := &pt.ParacrossHeightStatusRsp{
Status:status.Status, Status: status.Status,
Title:status.Title, Title: status.Title,
Height:status.Height, Height: status.Height,
MainHeight:status.MainHeight, MainHeight: status.MainHeight,
MainHash:common.ToHex(status.MainHash), MainHash: common.ToHex(status.MainHash),
} }
for i,addr := range status.Details.Addrs{ for i, addr := range status.Details.Addrs {
res.CommitAddrs = append(res.CommitAddrs, addr) res.CommitAddrs = append(res.CommitAddrs, addr)
res.CommitBlockHash = append(res.CommitBlockHash,common.ToHex(status.Details.BlockHash[i])) res.CommitBlockHash = append(res.CommitBlockHash, common.ToHex(status.Details.BlockHash[i]))
} }
return res,nil return res, nil
} }
// Query_GetTitleByHash query paracross title by block hash // Query_GetTitleByHash query paracross title by block hash
......
...@@ -104,7 +104,6 @@ func (c *channelClient) GetDoneTitleHeight(ctx context.Context, req *pt.ReqParac ...@@ -104,7 +104,6 @@ func (c *channelClient) GetDoneTitleHeight(ctx context.Context, req *pt.ReqParac
return nil, types.ErrDecode return nil, types.ErrDecode
} }
func (c *channelClient) GetAssetTxResult(ctx context.Context, req *types.ReqHash) (*pt.ParacrossAsset, error) { func (c *channelClient) GetAssetTxResult(ctx context.Context, req *types.ReqHash) (*pt.ParacrossAsset, error) {
data, err := c.Query(pt.GetExecName(), "GetAssetTxResult", req) data, err := c.Query(pt.GetExecName(), "GetAssetTxResult", req)
if err != nil { if err != nil {
......
This diff is collapsed.
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