Merge pull request #17 from axieinfinity/revert-16-feature/removed-rows

Revert "Now Delete methods return the number of affected rows"
axieinfinity · Oct 17, 2022 · 2d9310c · 2d9310c
2 parents a73dac4 + c254641
commit 2d9310c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/stores/event.go b/stores/event.go
@@ -18,9 +18,8 @@ func (e *eventStore) Save(event *models.Event) error {
 	return e.Clauses(clause.OnConflict{DoNothing: true}).Create(event).Error
 }
 
-func (e *eventStore) DeleteEvents(createdAt uint64) (int64, error) {
-	db := e.Where("created_at <= ?", createdAt).Delete(&models.Event{})
-	return db.RowsAffected, db.Error
+func (e *eventStore) DeleteEvents(createdAt uint64) error {
+	return e.Where("created_at <= ?", createdAt).Delete(&models.Event{}).Error
 }
 
 func (e *eventStore) Count() int64 {

diff --git a/stores/job.go b/stores/job.go
@@ -64,9 +64,8 @@ func (j *jobStore) SearchJobs(req *SearchJobs) ([]*models.Job, error) {
 	return jobs, nil
 }
 
-func (j *jobStore) DeleteJobs(status []string, createdAt uint64) (int64, error) {
-	db := j.Where("status in ? AND created_at <= ?", status, createdAt).Delete(&models.Job{})
-	return db.RowsAffected, db.Error
+func (j *jobStore) DeleteJobs(status []string, createdAt uint64) error {
+	return j.Where("status in ? AND created_at <= ?", status, createdAt).Delete(&models.Job{}).Error
 }
 
 func (j *jobStore) Count() int64 {

diff --git a/stores/main.go b/stores/main.go
@@ -35,7 +35,7 @@ type JobStore interface {
 	Update(job *models.Job) error
 	GetPendingJobs() ([]*models.Job, error)
 	SearchJobs(req *SearchJobs) ([]*models.Job, error)
-	DeleteJobs([]string, uint64) (int64, error)
+	DeleteJobs([]string, uint64) error
 	Count() int64
 }
 
@@ -46,7 +46,7 @@ type ProcessedBlockStore interface {
 
 type EventStore interface {
 	Save(event *models.Event) error
-	DeleteEvents(uint64) (int64, error)
+	DeleteEvents(uint64) error
 	Count() int64
 }