fix: change errInfo to errMsg

ipfs-force-community · Nov 11, 2022 · 8466fc6 · 8466fc6
1 parent 13d7bc6
commit 8466fc6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/models/mysql/message.go b/models/mysql/message.go
@@ -53,7 +53,7 @@ type mysqlMessage struct {
 	State types.MessageState `gorm:"column:state;type:int;index:msg_state;index:msg_from_state;index:idx_messages_create_at_state_from_addr;NOT NULL"`
 
 	IsDeleted int       `gorm:"column:is_deleted;index;default:-1;NOT NULL"` // 是否删除 1:是  -1:否
-	ErrorMsg  string    `gorm:"column:error_info;type:varchar(2048);"`
+	ErrorMsg  string    `gorm:"column:error_msg;type:varchar(2048);"`
 	CreatedAt time.Time `gorm:"column:created_at;index;index:idx_messages_create_at_state_from_addr;NOT NULL"` // 创建时间
 	UpdatedAt time.Time `gorm:"column:updated_at;index;NOT NULL"`                                              // 更新时间
 }
@@ -505,9 +505,9 @@ func (m *mysqlMessageRepo) MarkBadMessage(id string) error {
 	return m.DB.Debug().Model(&mysqlMessage{}).Where("id = ?", id).UpdateColumns(updateColumns).Error
 }
 
-func (m *mysqlMessageRepo) UpdateErrInfo(id string, returnVal string) error {
+func (m *mysqlMessageRepo) UpdateErrMsg(id string, errMsg string) error {
 	updateColumns := map[string]interface{}{
-		"error_info": returnVal,
+		"error_info": errMsg,
 		"updated_at": time.Now(),
 	}
 	return m.DB.Model((*mysqlMessage)(nil)).Where("id = ?", id).UpdateColumns(updateColumns).Error

diff --git a/models/mysql/message_test.go b/models/mysql/message_test.go
@@ -55,7 +55,7 @@ func TestMessage(t *testing.T) {
 	t.Run("mysql test update message state by cid", wrapper(testUpdateMessageStateByCid, r, mock))
 	t.Run("mysql test update message state by id", wrapper(testUpdateMessageStateByID, r, mock))
 	t.Run("mysql test mark bad message", wrapper(testMarkBadMessage, r, mock))
-	t.Run("mysql test update return value", wrapper(testUpdateErrInfo, r, mock))
+	t.Run("mysql test update return value", wrapper(testUpdateErrMsg, r, mock))
 
 	assert.NoError(t, closeDB(mock, sqlDB))
 }
@@ -513,17 +513,17 @@ func testMarkBadMessage(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
 	assert.NoError(t, r.MessageRepo().MarkBadMessage(id))
 }
 
-func testUpdateErrInfo(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
+func testUpdateErrMsg(t *testing.T, r repo.Repo, mock sqlmock.Sqlmock) {
 	id := venusTypes.NewUUID().String()
-	returnVal := "val"
+	errMsg := "val"
 
 	mock.ExpectBegin()
 	mock.ExpectExec(regexp.QuoteMeta("UPDATE `messages` SET `error_info`=?,`updated_at`=? WHERE id = ?")).
-		WithArgs(returnVal, anyTime{}, id).
+		WithArgs(errMsg, anyTime{}, id).
 		WillReturnResult(sqlmock.NewResult(1, 1))
 	mock.ExpectCommit()
 
-	assert.NoError(t, r.MessageRepo().UpdateErrInfo(id, returnVal))
+	assert.NoError(t, r.MessageRepo().UpdateErrMsg(id, errMsg))
 }
 
 func checkMsgWithIDs(t *testing.T, msgs []*types.Message, ids []string) {

diff --git a/models/repo/message_repo.go b/models/repo/message_repo.go
@@ -45,5 +45,5 @@ type MessageRepo interface {
 	UpdateMessageStateByCid(unsignedCid string, state types.MessageState) error
 	UpdateMessageStateByID(id string, state types.MessageState) error
 	MarkBadMessage(id string) error
-	UpdateErrInfo(id string, returnVal string) error
+	UpdateErrMsg(id string, errMsg string) error
 }
diff --git a/models/sqlite/message.go b/models/sqlite/message.go
@@ -506,9 +506,9 @@ func (m *sqliteMessageRepo) MarkBadMessage(id string) error {
 	return m.DB.Model(&sqliteMessage{}).Where("id = ?", id).UpdateColumns(updateColumns).Error
 }
 
-func (m *sqliteMessageRepo) UpdateErrInfo(id string, returnVal string) error {
+func (m *sqliteMessageRepo) UpdateErrMsg(id string, errMsg string) error {
 	updateColumns := map[string]interface{}{
-		"error_info": returnVal,
+		"error_info": errMsg,
 		"updated_at": time.Now(),
 	}
 	return m.DB.Model(&sqliteMessage{}).Where("id = ?", id).UpdateColumns(updateColumns).Error

diff --git a/models/sqlite/message_test.go b/models/sqlite/message_test.go
@@ -570,7 +570,7 @@ func TestMarkBadMessage(t *testing.T) {
 	assert.Equal(t, types.FailedMsg, msg.State)
 }
 
-func TestUpdateErrInfo(t *testing.T) {
+func TestUpdateErrMsg(t *testing.T) {
 	messageRepo := setupRepo(t).MessageRepo()
 
 	msgs := testhelper.NewMessages(2)
@@ -579,7 +579,7 @@ func TestUpdateErrInfo(t *testing.T) {
 		assert.NoError(t, err)
 	}
 	failedInfo := "gas estimate failed"
-	err := messageRepo.UpdateErrInfo(msgs[0].ID, failedInfo)
+	err := messageRepo.UpdateErrMsg(msgs[0].ID, failedInfo)
 	assert.NoError(t, err)
 	msg, err := messageRepo.GetMessageByUid(msgs[0].ID)
 	assert.NoError(t, err)

diff --git a/service/message_service.go b/service/message_service.go
@@ -661,7 +661,7 @@ func (ms *MessageService) saveSelectedMessagesToDB(ctx context.Context, selectRe
 
 		for _, m := range selectResult.ErrMsg {
 			log.Infof("update message %s return value with error %s", m.id, m.err)
-			err := txRepo.MessageRepo().UpdateErrInfo(m.id, m.err)
+			err := txRepo.MessageRepo().UpdateErrMsg(m.id, m.err)
 			if err != nil {
 				return err
 			}