Skip to content

Commit 4935d37

Browse files
committed
fix some test cases that is affected
1 parent 69da04e commit 4935d37

File tree

1 file changed

+44
-25
lines changed

1 file changed

+44
-25
lines changed

common/transaction/multiSignature_test.go

Lines changed: 44 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package transaction
33
import (
44
"database/sql"
55
"errors"
6+
"fmt"
67
"reflect"
78
"testing"
89

@@ -1161,7 +1162,7 @@ type (
11611162
mockMultisignatureValidateMultisigInfoExist struct {
11621163
MultisignatureInfoHelperInterface
11631164
}
1164-
mockValidateMultisigUtilValidateSignatureInfoSucess struct {
1165+
mockValidateMultisigUtilValidateSignatureInfoSuccess struct {
11651166
MultisigTransactionUtilInterface
11661167
}
11671168

@@ -1174,11 +1175,14 @@ var (
11741175
mockFeeMultisignatureValidate int64 = 10
11751176
)
11761177

1177-
func (*mockValidateMultisigUtilValidateSignatureInfoSucess) ValidateSignatureInfo(
1178+
func (*mockValidateMultisigUtilValidateSignatureInfoSuccess) ValidateSignatureInfo(
11781179
signature crypto.SignatureInterface, signatureInfo *model.SignatureInfo, multisignatureAddresses map[string]bool,
11791180
) error {
11801181
return nil
11811182
}
1183+
func (*mockValidateMultisigUtilValidateSignatureInfoSuccess) ValidateMultisignatureInfo(info *model.MultiSignatureInfo) error {
1184+
return nil
1185+
}
11821186

11831187
func (*mockMultisignatureValidateMultisigInfoNotExist) GetMultisigInfoByAddress(
11841188
multisigInfo *model.MultiSignatureInfo,
@@ -1316,6 +1320,40 @@ func (*mockAccountBalanceHelperMultisignatureValidateSuccess) GetBalanceByAccoun
13161320
func (*mockAccountBalanceHelperMultisignatureValidateSuccess) HasEnoughSpendableBalance(bool, []byte, int64) (enough bool, err error) {
13171321
return true, nil
13181322
}
1323+
1324+
type (
1325+
mockMultiSignatureInfoHelper struct {
1326+
wantErr bool
1327+
MultisignatureInfoHelper
1328+
}
1329+
mockMultiSigTransactionUtil struct {
1330+
wantErr bool
1331+
MultisigTransactionUtil
1332+
}
1333+
)
1334+
1335+
func (m *mockMultiSignatureInfoHelper) GetMultisigInfoByAddress(*model.MultiSignatureInfo, []byte, uint32) error {
1336+
if m.wantErr {
1337+
return fmt.Errorf("wantErr")
1338+
}
1339+
return nil
1340+
}
1341+
func (m *mockMultiSigTransactionUtil) ValidatePendingTransactionBytes(
1342+
UtilInterface,
1343+
TypeActionSwitcher,
1344+
MultisignatureInfoHelperInterface,
1345+
PendingTransactionHelperInterface,
1346+
*model.MultiSignatureInfo,
1347+
[]byte, []byte,
1348+
uint32,
1349+
bool,
1350+
) error {
1351+
if m.wantErr {
1352+
return fmt.Errorf("wantErr")
1353+
}
1354+
return nil
1355+
}
1356+
13191357
func TestMultiSignatureTransaction_Validate(t *testing.T) {
13201358
type fields struct {
13211359
ID int64
@@ -1404,7 +1442,7 @@ func TestMultiSignatureTransaction_Validate(t *testing.T) {
14041442
},
14051443
MultisigUtil: &mockMultisignatureValidateMultisigUtilValidateMultisigInfoSuccessSignatureInfoFail{},
14061444
AccountBalanceHelper: &mockAccountBalanceHelperMultisignatureValidateSuccess{},
1407-
MultisignatureInfoHelper: &MultisignatureInfoHelper{},
1445+
MultisignatureInfoHelper: &mockMultiSignatureInfoHelper{},
14081446
},
14091447
args: args{
14101448
dbTx: true,
@@ -1438,8 +1476,9 @@ func TestMultiSignatureTransaction_Validate(t *testing.T) {
14381476
UnsignedTransactionBytes: make([]byte, 32),
14391477
SignatureInfo: &model.SignatureInfo{},
14401478
},
1441-
MultisigUtil: &mockMultisignatureValidateMultisigUtilValidatePendingTxSuccessValidateSignatureInfoFail{},
1442-
AccountBalanceHelper: &mockAccountBalanceHelperMultisignatureValidateSuccess{},
1479+
MultisigUtil: &mockMultiSigTransactionUtil{},
1480+
AccountBalanceHelper: &mockAccountBalanceHelperMultisignatureValidateSuccess{},
1481+
PendingTransactionHelper: &mockMultisignatureValidateMultisigUtilPendingTransactionHelperPendingTransactionExist{},
14431482
},
14441483
args: args{
14451484
dbTx: true,
@@ -1520,26 +1559,6 @@ func TestMultiSignatureTransaction_Validate(t *testing.T) {
15201559
},
15211560
wantErr: true,
15221561
},
1523-
{
1524-
name: "Validate - multisignatureInfo:notExist - pending transaction exist - " +
1525-
"get multisigInfo exist - ValidateSignatureSuccess",
1526-
fields: fields{
1527-
Fee: mockFeeMultisignatureValidate,
1528-
Body: &model.MultiSignatureTransactionBody{
1529-
MultiSignatureInfo: nil,
1530-
UnsignedTransactionBytes: nil,
1531-
SignatureInfo: &model.SignatureInfo{},
1532-
},
1533-
PendingTransactionHelper: &mockMultisignatureValidateMultisigUtilPendingTransactionHelperPendingTransactionExist{},
1534-
MultisignatureInfoHelper: &mockMultisignatureValidateMultisigInfoExist{},
1535-
MultisigUtil: &mockValidateMultisigUtilValidateSignatureInfoSucess{},
1536-
AccountBalanceHelper: &mockAccountBalanceHelperMultisignatureValidateSuccess{},
1537-
},
1538-
args: args{
1539-
dbTx: true,
1540-
},
1541-
wantErr: false,
1542-
},
15431562
}
15441563
for _, tt := range tests {
15451564
t.Run(tt.name, func(t *testing.T) {

0 commit comments

Comments
 (0)