#134 fix mempool tests

Author: andy-shi88

common/query/mempoolQuery_test.go

@@ -16,7 +16,7 @@ var mockMempoolQuery = &MempoolQuery{
 	TableName: "mempool",
 	Fields: []string{
 		"id", "fee_per_byte", "arrival_timestamp", "transaction_bytes",
-		"sender_account_id", "recipient_account_id",
+		"sender_account_address", "recipient_account_address",
 	},
 }
 
@@ -67,8 +67,8 @@ func TestMempoolQuery_getTableName(t *testing.T) {
 func TestMempoolQuery_GetMempoolTransactions(t *testing.T) {
 	t.Run("GetMempoolTransactions:success", func(t *testing.T) {
 		q := mockMempoolQuery.GetMempoolTransactions()
-		wantQ := "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_id" +
-			", recipient_account_id FROM mempool"
+		wantQ := "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_address" +
+			", recipient_account_address FROM mempool"
 		if q != wantQ {
 			t.Errorf("query returned wrong: get: %s\nwant: %s", q, wantQ)
 		}
@@ -78,8 +78,8 @@ func TestMempoolQuery_GetMempoolTransactions(t *testing.T) {
 func TestMempoolQuery_GetMempoolTransaction(t *testing.T) {
 	t.Run("GetMempoolTransaction:success", func(t *testing.T) {
 		q := mockMempoolQuery.GetMempoolTransaction()
-		wantQ := "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_id," +
-			" recipient_account_id FROM mempool WHERE id = :id"
+		wantQ := "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_address," +
+			" recipient_account_address FROM mempool WHERE id = :id"
 		if q != wantQ {
 			t.Errorf("query returned wrong: get: %s\nwant: %s", q, wantQ)
 		}
@@ -89,9 +89,9 @@ func TestMempoolQuery_GetMempoolTransaction(t *testing.T) {
 func TestMempoolQuery_InsertMempoolTransaction(t *testing.T) {
 	t.Run("InsertMempoolTransaction:success", func(t *testing.T) {
 		q := mockMempoolQuery.InsertMempoolTransaction()
-		wantQ := "INSERT INTO mempool (id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_id," +
-			" recipient_account_id) VALUES(:id, :fee_per_byte, :arrival_timestamp, :transaction_bytes," +
-			" :sender_account_id, :recipient_account_id)"
+		wantQ := "INSERT INTO mempool (id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_address," +
+			" recipient_account_address) VALUES(:id, :fee_per_byte, :arrival_timestamp, :transaction_bytes," +
+			" :sender_account_address, :recipient_account_address)"
 		if q != wantQ {
 			t.Errorf("query returned wrong: get: %s\nwant: %s", q, wantQ)
 		}

core/service/mempoolCoreService_test.go

@@ -23,17 +23,17 @@ type (
 	}
 )
 
-var getTxByIDQuery = "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_id, " +
-	"recipient_account_id FROM mempool WHERE id = :id"
+var getTxByIDQuery = "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_address, " +
+	"recipient_account_address FROM mempool WHERE id = :id"
 
 func (*mockMempoolQueryExecutorSuccess) ExecuteSelect(qe string, args ...interface{}) (*sql.Rows, error) {
 	db, mock, _ := sqlmock.New()
 	defer db.Close()
 	switch qe {
 
-	case "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_id, recipient_account_id FROM mempool":
-		mockedRows := sqlmock.NewRows([]string{"id", "fee_per_byte", "arrival_timestamp", "transaction_bytes", "sender_account_id",
-			"recipient_account_id"})
+	case "SELECT id, fee_per_byte, arrival_timestamp, transaction_bytes, sender_account_address, recipient_account_address FROM mempool":
+		mockedRows := sqlmock.NewRows([]string{"id", "fee_per_byte", "arrival_timestamp", "transaction_bytes", "sender_account_address",
+			"recipient_account_address"})
 		mockedRows.AddRow(1, 1, 1562893305, getTestSignedMempoolTransaction(1, 1562893305).TransactionBytes, "A", "B")
 		mockedRows.AddRow(2, 10, 1562893304, getTestSignedMempoolTransaction(2, 1562893304).TransactionBytes, "A", "B")
 		mockedRows.AddRow(3, 1, 1562893302, getTestSignedMempoolTransaction(3, 1562893302).TransactionBytes, "A", "B")
@@ -75,7 +75,7 @@ func (*mockMempoolQueryExecutorFail) ExecuteSelect(qe string, args ...interface{
 	// before adding mempool transactions to db we check for duplicate transactions
 	case getTxByIDQuery:
 		mock.ExpectQuery(regexp.QuoteMeta(qe)).WillReturnRows(sqlmock.NewRows([]string{
-			"id", "fee_per_byte", "arrival_timestamp", "transaction_bytes", "sender_account_id", "recipient_account_id"},
+			"id", "fee_per_byte", "arrival_timestamp", "transaction_bytes", "sender_account_address", "recipient_account_address"},
 		).AddRow(3, 1, 1562893302, []byte{}, []byte{1}, []byte{2}))
 	default:
 		return nil, errors.New("MockedError")