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
731dfd7a
Commit
731dfd7a
authored
May 18, 2019
by
linj
Committed by
vipwzw
May 21, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix create action name, fix type
parent
c06bd0b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
rpc.go
plugin/dapp/unfreeze/rpc/rpc.go
+3
-3
types.go
plugin/dapp/unfreeze/types/types.go
+6
-5
No files found.
plugin/dapp/unfreeze/rpc/rpc.go
View file @
731dfd7a
...
@@ -63,7 +63,7 @@ func (c *Jrpc) CreateRawUnfreezeCreate(param *pty.UnfreezeCreate, result *interf
...
@@ -63,7 +63,7 @@ func (c *Jrpc) CreateRawUnfreezeCreate(param *pty.UnfreezeCreate, result *interf
if
param
==
nil
{
if
param
==
nil
{
return
types
.
ErrInvalidParam
return
types
.
ErrInvalidParam
}
}
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
UnfreezeCreateTX
"
,
param
)
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
Create
"
,
param
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -76,7 +76,7 @@ func (c *Jrpc) CreateRawUnfreezeWithdraw(param *pty.UnfreezeWithdraw, result *in
...
@@ -76,7 +76,7 @@ func (c *Jrpc) CreateRawUnfreezeWithdraw(param *pty.UnfreezeWithdraw, result *in
if
param
==
nil
{
if
param
==
nil
{
return
types
.
ErrInvalidParam
return
types
.
ErrInvalidParam
}
}
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
UnfreezeWithdrawTx
"
,
param
)
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
Withdraw
"
,
param
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
@@ -89,7 +89,7 @@ func (c *Jrpc) CreateRawUnfreezeTerminate(param *pty.UnfreezeTerminate, result *
...
@@ -89,7 +89,7 @@ func (c *Jrpc) CreateRawUnfreezeTerminate(param *pty.UnfreezeTerminate, result *
if
param
==
nil
{
if
param
==
nil
{
return
types
.
ErrInvalidParam
return
types
.
ErrInvalidParam
}
}
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
UnfreezeTerminateTx
"
,
param
)
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
pty
.
UnfreezeX
),
"
Terminate
"
,
param
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
plugin/dapp/unfreeze/types/types.go
View file @
731dfd7a
...
@@ -75,8 +75,8 @@ func (u *UnfreezeType) GetTypeMap() map[string]int32 {
...
@@ -75,8 +75,8 @@ func (u *UnfreezeType) GetTypeMap() map[string]int32 {
}
}
// CreateTx 创建交易
// CreateTx 创建交易
func
(
u
UnfreezeType
)
CreateTx
(
action
string
,
message
json
.
RawMessage
)
(
*
types
.
Transaction
,
error
)
{
func
(
u
*
UnfreezeType
)
CreateTx
(
action
string
,
message
json
.
RawMessage
)
(
*
types
.
Transaction
,
error
)
{
tlog
.
Debug
(
"UnfreezeType.CreateTx"
,
"action"
,
action
)
tlog
.
Error
(
"UnfreezeType.CreateTx"
,
"action"
,
action
,
"message"
,
string
(
message
)
)
if
action
==
Action_CreateUnfreeze
{
if
action
==
Action_CreateUnfreeze
{
var
param
UnfreezeCreate
var
param
UnfreezeCreate
err
:=
types
.
JSONToPB
(
message
,
&
param
)
err
:=
types
.
JSONToPB
(
message
,
&
param
)
...
@@ -107,12 +107,13 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
...
@@ -107,12 +107,13 @@ func (u UnfreezeType) CreateTx(action string, message json.RawMessage) (*types.T
}
}
// RPC_UnfreezeCreateTx 创建冻结合约交易入口
// RPC_UnfreezeCreateTx 创建冻结合约交易入口
func
(
u
UnfreezeType
)
RPC_UnfreezeCreateTx
(
parm
*
UnfreezeCreate
)
(
*
types
.
Transaction
,
error
)
{
func
(
u
*
UnfreezeType
)
RPC_UnfreezeCreateTx
(
parm
*
UnfreezeCreate
)
(
*
types
.
Transaction
,
error
)
{
return
CreateUnfreezeCreateTx
(
types
.
GetParaName
(),
parm
)
return
CreateUnfreezeCreateTx
(
types
.
GetParaName
(),
parm
)
}
}
// CreateUnfreezeCreateTx 创建冻结合约交易
// CreateUnfreezeCreateTx 创建冻结合约交易
func
CreateUnfreezeCreateTx
(
title
string
,
parm
*
UnfreezeCreate
)
(
*
types
.
Transaction
,
error
)
{
func
CreateUnfreezeCreateTx
(
title
string
,
parm
*
UnfreezeCreate
)
(
*
types
.
Transaction
,
error
)
{
tlog
.
Error
(
"CreateUnfreezeCreateTx"
,
"parm"
,
parm
)
if
parm
==
nil
{
if
parm
==
nil
{
tlog
.
Error
(
"RPC_UnfreezeCreateTx"
,
"parm"
,
parm
)
tlog
.
Error
(
"RPC_UnfreezeCreateTx"
,
"parm"
,
parm
)
return
nil
,
types
.
ErrInvalidParam
return
nil
,
types
.
ErrInvalidParam
...
@@ -140,7 +141,7 @@ func CreateUnfreezeCreateTx(title string, parm *UnfreezeCreate) (*types.Transact
...
@@ -140,7 +141,7 @@ func CreateUnfreezeCreateTx(title string, parm *UnfreezeCreate) (*types.Transact
}
}
// RPC_UnfreezeWithdrawTx 创建提币交易入口
// RPC_UnfreezeWithdrawTx 创建提币交易入口
func
(
u
UnfreezeType
)
RPC_UnfreezeWithdrawTx
(
parm
*
UnfreezeWithdraw
)
(
*
types
.
Transaction
,
error
)
{
func
(
u
*
UnfreezeType
)
RPC_UnfreezeWithdrawTx
(
parm
*
UnfreezeWithdraw
)
(
*
types
.
Transaction
,
error
)
{
return
CreateUnfreezeWithdrawTx
(
types
.
GetParaName
(),
parm
)
return
CreateUnfreezeWithdrawTx
(
types
.
GetParaName
(),
parm
)
}
}
...
@@ -168,7 +169,7 @@ func CreateUnfreezeWithdrawTx(title string, parm *UnfreezeWithdraw) (*types.Tran
...
@@ -168,7 +169,7 @@ func CreateUnfreezeWithdrawTx(title string, parm *UnfreezeWithdraw) (*types.Tran
}
}
// RPC_UnfreezeTerminateTx 创建终止冻结合约入口
// RPC_UnfreezeTerminateTx 创建终止冻结合约入口
func
(
u
UnfreezeType
)
RPC_UnfreezeTerminateTx
(
parm
*
UnfreezeTerminate
)
(
*
types
.
Transaction
,
error
)
{
func
(
u
*
UnfreezeType
)
RPC_UnfreezeTerminateTx
(
parm
*
UnfreezeTerminate
)
(
*
types
.
Transaction
,
error
)
{
return
CreateUnfreezeTerminateTx
(
types
.
GetParaName
(),
parm
)
return
CreateUnfreezeTerminateTx
(
types
.
GetParaName
(),
parm
)
}
}
...
...
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