fix some unit tests that affected

Author: astaphobia

common/query/pendingSignatureQuery_test.go

@@ -26,8 +26,8 @@ func TestNewPendingSignatureQuery(t *testing.T) {
 			want: &PendingSignatureQuery{
 				Fields: []string{
 					"transaction_hash",
-					"account_address",
 					"multisig_address",
+					"account_address",
 					"signature",
 					"block_height",
 					"latest",
@@ -226,7 +226,7 @@ func TestPendingSignatureQuery_GetPendingSignatureByHash(t *testing.T) {
 				currentHeight: 0,
 				limit:         constant.MinRollbackBlocks,
 			},
-			wantStr: "SELECT transaction_hash, account_address, signature, block_height, latest FROM " +
+			wantStr: "SELECT transaction_hash, multisig_address, account_address, signature, block_height, latest FROM " +
 				"pending_signature WHERE transaction_hash = ? AND block_height >= ? AND latest = true",
 			wantArgs: []interface{}{
 				make([]byte, 32),
@@ -503,7 +503,7 @@ func TestPendingSignatureQuery_SelectDataForSnapshot(t *testing.T) {
 				fromHeight: 1,
 				toHeight:   10,
 			},
-			want: "SELECT transaction_hash,account_address,signature,block_height,latest FROM pending_signature WHERE (account_address, " +
+			want: "SELECT transaction_hash,multisig_address,account_address,signature,block_height,latest FROM pending_signature WHERE (account_address, " +
 				"transaction_hash, block_height) IN (SELECT t2.account_address, t2.transaction_hash, " +
 				"MAX(t2.block_height) FROM pending_signature as t2 WHERE t2.block_height >= 1 AND t2.block_height <= 10 AND t2.block_height != 0 " +
 				"GROUP BY t2.account_address, t2.transaction_hash) ORDER BY block_height",
@@ -586,7 +586,8 @@ func TestPendingSignatureQuery_InsertPendingSignatures(t *testing.T) {
 					mockInsertPendingSignaturePendingSig,
 				},
 			},
-			wantStr:  "INSERT INTO pending_signature (transaction_hash, account_address, signature, block_height, latest) VALUES (?, ?, ?, ?, ?)",
+			wantStr: "INSERT INTO pending_signature (transaction_hash, multisig_address, account_address, signature, " +
+				"block_height, latest) VALUES (?, ?, ?, ?, ?, ?)",
 			wantArgs: NewPendingSignatureQuery().ExtractModel(mockInsertPendingSignaturePendingSig),
 		},
 	}
@@ -598,7 +599,7 @@ func TestPendingSignatureQuery_InsertPendingSignatures(t *testing.T) {
 			}
 			gotStr, gotArgs := psq.InsertPendingSignatures(tt.args.pendingSigs)
 			if gotStr != tt.wantStr {
-				t.Errorf("InsertPendingSignatures() gotStr = %v, want %v", gotStr, tt.wantStr)
+				t.Errorf("InsertPendingSignatures() gotStr = \n%v, want \n%v", gotStr, tt.wantStr)
 			}
 			if !reflect.DeepEqual(gotArgs, tt.wantArgs) {
 				t.Errorf("InsertPendingSignatures() gotArgs = %v, want %v", gotArgs, tt.wantArgs)

common/query/transactionQuery.go

@@ -71,7 +71,7 @@ func (tq *TransactionQuery) GetTransaction(id int64) string {
 // InsertTransaction inserts a new transaction into DB
 func (tq *TransactionQuery) InsertTransaction(tx *model.Transaction) (str string, args []interface{}) {
 	var value = fmt.Sprintf("?%s", strings.Repeat(", ?", len(tq.Fields)-1))
-	query := fmt.Sprintf("INSERT INTO %s (%s) VALUES(%s)",
+	query := fmt.Sprintf("INSERT OR REPLACE INTO %s (%s) VALUES(%s)",
 		tq.getTableName(), strings.Join(tq.Fields, ", "), value)
 	return query, tq.ExtractModel(tx)
 }

common/query/transactionQuery_test.go

@@ -155,7 +155,7 @@ func TestTransactionQuery_InsertTransaction(t *testing.T) {
 			name:   "wantSuccess",
 			fields: fields(*mockTransactionQuery),
 			args:   args{tx: mockTransaction},
-			wantStr: fmt.Sprintf("INSERT INTO \"transaction\" (%s) VALUES(?%s)",
+			wantStr: fmt.Sprintf("INSERT OR REPLACE INTO \"transaction\" (%s) VALUES(?%s)",
 				strings.Join(mockTransactionQuery.Fields, ", "),
 				strings.Repeat(", ?", len(mockTransactionQuery.Fields)-1),
 			),

common/transaction/multiSignature_test.go

@@ -1313,7 +1313,9 @@ func (*mockAccountBalanceHelperMultisignatureValidateSuccess) GetBalanceByAccoun
 	accountBalance.SpendableBalance = mockFeeMultisignatureValidate + 1
 	return nil
 }
-
+func (*mockAccountBalanceHelperMultisignatureValidateSuccess) HasEnoughSpendableBalance(bool, []byte, int64) (enough bool, err error) {
+	return true, nil
+}
 func TestMultiSignatureTransaction_Validate(t *testing.T) {
 	type fields struct {
 		ID                       int64
@@ -1400,8 +1402,9 @@ func TestMultiSignatureTransaction_Validate(t *testing.T) {
 					UnsignedTransactionBytes: nil,
 					SignatureInfo:            &model.SignatureInfo{},
 				},
-				MultisigUtil:         &mockMultisignatureValidateMultisigUtilValidateMultisigInfoSuccessSignatureInfoFail{},
-				AccountBalanceHelper: &mockAccountBalanceHelperMultisignatureValidateSuccess{},
+				MultisigUtil:             &mockMultisignatureValidateMultisigUtilValidateMultisigInfoSuccessSignatureInfoFail{},
+				AccountBalanceHelper:     &mockAccountBalanceHelperMultisignatureValidateSuccess{},
+				MultisignatureInfoHelper: &MultisignatureInfoHelper{},
 			},
 			args: args{
 				dbTx: true,