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
0ace7ab6
Commit
0ace7ab6
authored
Dec 10, 2018
by
heyubin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add by hyb for golint
parent
e2b25d26
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
25 deletions
+25
-25
jrpc_channel_test.go
plugin/dapp/multisig/rpc/jrpc_channel_test.go
+20
-20
rpc.go
plugin/dapp/multisig/rpc/rpc.go
+5
-5
No files found.
plugin/dapp/multisig/rpc/jrpc_channel_test.go
View file @
0ace7ab6
...
@@ -73,51 +73,51 @@ func TestJRPCChannel(t *testing.T) {
...
@@ -73,51 +73,51 @@ func TestJRPCChannel(t *testing.T) {
//创建交易
//创建交易
func
testCreateMultiSigAccCreateCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccCreateCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigAccCreate
{}
params
:=
&
mty
.
MultiSigAccCreate
{}
return
jrpc
.
Call
(
"multisig.MultiSigAccCreateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigAccCreateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccOwnerAddCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccOwnerAddCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigOwnerOperate
{}
params
:=
&
mty
.
MultiSigOwnerOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccOwnerDelCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccOwnerDelCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigOwnerOperate
{}
params
:=
&
mty
.
MultiSigOwnerOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccOwnerModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccOwnerModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigOwnerOperate
{}
params
:=
&
mty
.
MultiSigOwnerOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccOwnerReplaceCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccOwnerReplaceCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigOwnerOperate
{}
params
:=
&
mty
.
MultiSigOwnerOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigOwnerOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccWeightModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccWeightModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigAccOperate
{}
params
:=
&
mty
.
MultiSigAccOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigAccOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigAccOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccDailyLimitModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccDailyLimitModifyCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigAccOperate
{}
params
:=
&
mty
.
MultiSigAccOperate
{}
return
jrpc
.
Call
(
"multisig.MultiSigAccOperateTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigAccOperateTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigConfirmTxCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigConfirmTxCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigConfirmTx
{}
params
:=
&
mty
.
MultiSigConfirmTx
{}
return
jrpc
.
Call
(
"multisig.MultiSigConfirmTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigConfirmTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccTransferInCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccTransferInCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigExecTransfer
{}
params
:=
&
mty
.
MultiSigExecTransfer
{}
return
jrpc
.
Call
(
"multisig.MultiSigAccTransferInTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigAccTransferInTx"
,
params
,
nil
)
}
}
func
testCreateMultiSigAccTransferOutCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testCreateMultiSigAccTransferOutCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
mty
.
MultiSigExecTransfer
{}
params
:=
&
mty
.
MultiSigExecTransfer
{}
return
jrpc
.
Call
(
"multisig.MultiSigAccTransferOutTx"
,
params
,
nil
)
return
jrpc
.
Call
(
"multisig.MultiSigAccTransferOutTx"
,
params
,
nil
)
}
}
//get 多重签名账户信息
//get 多重签名账户信息
func
testGetMultiSigAccCountCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccCountCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
rpctypes
.
Query4Jrpc
{
params
:=
&
rpctypes
.
Query4Jrpc
{
Execer
:
mty
.
MultiSigX
,
Execer
:
mty
.
MultiSigX
,
FuncName
:
"MultiSigAccCount"
,
FuncName
:
"MultiSigAccCount"
,
Payload
:
types
.
MustPBToJSON
(
&
types
.
ReqNil
{}),
Payload
:
types
.
MustPBToJSON
(
&
types
.
ReqNil
{}),
...
@@ -127,7 +127,7 @@ func testGetMultiSigAccCountCmd(t *testing.T, jrpc *jsonclient.JSONClient) error
...
@@ -127,7 +127,7 @@ func testGetMultiSigAccCountCmd(t *testing.T, jrpc *jsonclient.JSONClient) error
}
}
func
testGetMultiSigAccountsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccountsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
rpctypes
.
Query4Jrpc
{
params
:=
&
rpctypes
.
Query4Jrpc
{
Execer
:
mty
.
MultiSigX
,
Execer
:
mty
.
MultiSigX
,
FuncName
:
"MultiSigAccounts"
,
FuncName
:
"MultiSigAccounts"
,
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccs
{}),
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccs
{}),
...
@@ -137,7 +137,7 @@ func testGetMultiSigAccountsCmd(t *testing.T, jrpc *jsonclient.JSONClient) error
...
@@ -137,7 +137,7 @@ func testGetMultiSigAccountsCmd(t *testing.T, jrpc *jsonclient.JSONClient) error
}
}
func
testGetMultiSigAccountInfoCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccountInfoCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
rpctypes
.
Query4Jrpc
{
params
:=
&
rpctypes
.
Query4Jrpc
{
Execer
:
mty
.
MultiSigX
,
Execer
:
mty
.
MultiSigX
,
FuncName
:
"MultiSigAccountInfo"
,
FuncName
:
"MultiSigAccountInfo"
,
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccInfo
{}),
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccInfo
{}),
...
@@ -147,7 +147,7 @@ func testGetMultiSigAccountInfoCmd(t *testing.T, jrpc *jsonclient.JSONClient) er
...
@@ -147,7 +147,7 @@ func testGetMultiSigAccountInfoCmd(t *testing.T, jrpc *jsonclient.JSONClient) er
}
}
func
testGetMultiSigAccTxCountCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccTxCountCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
rpctypes
.
Query4Jrpc
{
params
:=
&
rpctypes
.
Query4Jrpc
{
Execer
:
mty
.
MultiSigX
,
Execer
:
mty
.
MultiSigX
,
FuncName
:
"MultiSigAccTxCount"
,
FuncName
:
"MultiSigAccTxCount"
,
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccInfo
{}),
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigAccInfo
{}),
...
@@ -157,7 +157,7 @@ func testGetMultiSigAccTxCountCmd(t *testing.T, jrpc *jsonclient.JSONClient) err
...
@@ -157,7 +157,7 @@ func testGetMultiSigAccTxCountCmd(t *testing.T, jrpc *jsonclient.JSONClient) err
}
}
func
testGetMultiSigTxidsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigTxidsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
params
:=
rpctypes
.
Query4Jrpc
{
params
:=
&
rpctypes
.
Query4Jrpc
{
Execer
:
mty
.
MultiSigX
,
Execer
:
mty
.
MultiSigX
,
FuncName
:
"MultiSigTxids"
,
FuncName
:
"MultiSigTxids"
,
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigTxids
{}),
Payload
:
types
.
MustPBToJSON
(
&
mty
.
ReqMultiSigTxids
{}),
...
@@ -174,7 +174,7 @@ func testGetMultiSigTxInfoCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
...
@@ -174,7 +174,7 @@ func testGetMultiSigTxInfoCmd(t *testing.T, jrpc *jsonclient.JSONClient) error {
params
.
FuncName
=
"MultiSigTxInfo"
params
.
FuncName
=
"MultiSigTxInfo"
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
rep
=
&
mty
.
MultiSigTx
{}
rep
=
&
mty
.
MultiSigTx
{}
return
jrpc
.
Call
(
"Chain33.Query"
,
params
,
rep
)
return
jrpc
.
Call
(
"Chain33.Query"
,
&
params
,
rep
)
}
}
func
testGetGetMultiSigTxConfirmedWeightCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetGetMultiSigTxConfirmedWeightCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
...
@@ -185,7 +185,7 @@ func testGetGetMultiSigTxConfirmedWeightCmd(t *testing.T, jrpc *jsonclient.JSONC
...
@@ -185,7 +185,7 @@ func testGetGetMultiSigTxConfirmedWeightCmd(t *testing.T, jrpc *jsonclient.JSONC
params
.
FuncName
=
"MultiSigTxConfirmedWeight"
params
.
FuncName
=
"MultiSigTxConfirmedWeight"
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
rep
=
&
mty
.
Uint64
{}
rep
=
&
mty
.
Uint64
{}
return
jrpc
.
Call
(
"Chain33.Query"
,
params
,
rep
)
return
jrpc
.
Call
(
"Chain33.Query"
,
&
params
,
rep
)
}
}
func
testGetGetMultiSigAccUnSpentTodayCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetGetMultiSigAccUnSpentTodayCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
...
@@ -197,7 +197,7 @@ func testGetGetMultiSigAccUnSpentTodayCmd(t *testing.T, jrpc *jsonclient.JSONCli
...
@@ -197,7 +197,7 @@ func testGetGetMultiSigAccUnSpentTodayCmd(t *testing.T, jrpc *jsonclient.JSONCli
params
.
FuncName
=
"MultiSigAccUnSpentToday"
params
.
FuncName
=
"MultiSigAccUnSpentToday"
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
rep
=
&
mty
.
ReplyUnSpentAssets
{}
rep
=
&
mty
.
ReplyUnSpentAssets
{}
return
jrpc
.
Call
(
"Chain33.Query"
,
params
,
rep
)
return
jrpc
.
Call
(
"Chain33.Query"
,
&
params
,
rep
)
}
}
func
testGetMultiSigAccAssetsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccAssetsCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
...
@@ -210,7 +210,7 @@ func testGetMultiSigAccAssetsCmd(t *testing.T, jrpc *jsonclient.JSONClient) erro
...
@@ -210,7 +210,7 @@ func testGetMultiSigAccAssetsCmd(t *testing.T, jrpc *jsonclient.JSONClient) erro
params
.
FuncName
=
"MultiSigAccAssets"
params
.
FuncName
=
"MultiSigAccAssets"
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
params
.
Payload
=
types
.
MustPBToJSON
(
req
)
rep
=
&
mty
.
ReplyAccAssets
{}
rep
=
&
mty
.
ReplyAccAssets
{}
return
jrpc
.
Call
(
"Chain33.Query"
,
params
,
rep
)
return
jrpc
.
Call
(
"Chain33.Query"
,
&
params
,
rep
)
}
}
func
testGetMultiSigAccAllAddressCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
func
testGetMultiSigAccAllAddressCmd
(
t
*
testing
.
T
,
jrpc
*
jsonclient
.
JSONClient
)
error
{
...
@@ -225,5 +225,5 @@ func testGetMultiSigAccAllAddressCmd(t *testing.T, jrpc *jsonclient.JSONClient)
...
@@ -225,5 +225,5 @@ func testGetMultiSigAccAllAddressCmd(t *testing.T, jrpc *jsonclient.JSONClient)
params
.
FuncName
=
"MultiSigAccAllAddress"
params
.
FuncName
=
"MultiSigAccAllAddress"
params
.
Payload
=
types
.
MustPBToJSON
(
&
req
)
params
.
Payload
=
types
.
MustPBToJSON
(
&
req
)
rep
=
&
mty
.
AccAddress
{}
rep
=
&
mty
.
AccAddress
{}
return
jrpc
.
Call
(
"Chain33.Query"
,
params
,
rep
)
return
jrpc
.
Call
(
"Chain33.Query"
,
&
params
,
rep
)
}
}
plugin/dapp/multisig/rpc/rpc.go
View file @
0ace7ab6
...
@@ -65,11 +65,11 @@ func (c *Jrpc) MultiSigConfirmTx(param *mty.MultiSigConfirmTx, result *interface
...
@@ -65,11 +65,11 @@ func (c *Jrpc) MultiSigConfirmTx(param *mty.MultiSigConfirmTx, result *interface
}
}
// MultiSigAccTransferInTx :构造在多重签名合约中转账到多重签名账户的交易
// MultiSigAccTransferInTx :构造在多重签名合约中转账到多重签名账户的交易
func
(
c
*
Jrpc
)
MultiSigAccTransferInTx
(
param
mty
.
MultiSigExecTransfer
,
result
*
interface
{})
error
{
func
(
c
*
Jrpc
)
MultiSigAccTransferInTx
(
param
*
mty
.
MultiSigExecTransfer
,
result
*
interface
{})
error
{
//
if param == nil {
if
param
==
nil
{
//
return types.ErrInvalidParam
return
types
.
ErrInvalidParam
//
}
}
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
mty
.
MultiSigX
),
"MultiSigExecTransferTo"
,
&
param
)
data
,
err
:=
types
.
CallCreateTx
(
types
.
ExecName
(
mty
.
MultiSigX
),
"MultiSigExecTransferTo"
,
param
)
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
...
...
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