Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
b94a1abd
Commit
b94a1abd
authored
May 30, 2019
by
vipwzw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
auto ci
parent
e010ff88
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
12 deletions
+11
-12
query.go
plugin/dapp/paracross/executor/query.go
+11
-11
rpc.go
plugin/dapp/paracross/rpc/rpc.go
+0
-1
paracross.pb.go
plugin/dapp/paracross/types/paracross.pb.go
+0
-0
No files found.
plugin/dapp/paracross/executor/query.go
View file @
b94a1abd
...
...
@@ -8,11 +8,11 @@ import (
"encoding/hex"
"fmt"
"github.com/33cn/chain33/common"
dbm
"github.com/33cn/chain33/common/db"
"github.com/33cn/chain33/types"
pt
"github.com/33cn/plugin/plugin/dapp/paracross/types"
"github.com/pkg/errors"
"github.com/33cn/chain33/common"
)
// Query_GetTitle query paracross title
...
...
@@ -28,24 +28,24 @@ func (p *Paracross) Query_GetTitleHeight(in *pt.ReqParacrossTitleHeight) (types.
if
in
==
nil
{
return
nil
,
types
.
ErrInvalidParam
}
stat
,
err
:=
p
.
paracrossGetStateTitleHeight
(
in
.
Title
,
in
.
Height
)
stat
,
err
:=
p
.
paracrossGetStateTitleHeight
(
in
.
Title
,
in
.
Height
)
if
err
!=
nil
{
clog
.
Error
(
"paracross.GetTitleHeight"
,
"title"
,
title
,
"height"
,
in
.
Height
,
"err"
,
err
.
Error
())
return
nil
,
err
return
nil
,
err
}
status
:=
stat
.
(
*
pt
.
ParacrossHeightStatus
)
res
:=
&
pt
.
ParacrossHeightStatusRsp
{
Status
:
status
.
Status
,
Title
:
status
.
Title
,
Height
:
status
.
Height
,
MainHeight
:
status
.
MainHeight
,
MainHash
:
common
.
ToHex
(
status
.
MainHash
),
Status
:
status
.
Status
,
Title
:
status
.
Title
,
Height
:
status
.
Height
,
MainHeight
:
status
.
MainHeight
,
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
.
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
...
...
plugin/dapp/paracross/rpc/rpc.go
View file @
b94a1abd
...
...
@@ -104,7 +104,6 @@ func (c *channelClient) GetDoneTitleHeight(ctx context.Context, req *pt.ReqParac
return
nil
,
types
.
ErrDecode
}
func
(
c
*
channelClient
)
GetAssetTxResult
(
ctx
context
.
Context
,
req
*
types
.
ReqHash
)
(
*
pt
.
ParacrossAsset
,
error
)
{
data
,
err
:=
c
.
Query
(
pt
.
GetExecName
(),
"GetAssetTxResult"
,
req
)
if
err
!=
nil
{
...
...
plugin/dapp/paracross/types/paracross.pb.go
View file @
b94a1abd
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment