From 203acc3fd9a370199e5763173cfb54ed4cf95de7 Mon Sep 17 00:00:00 2001
From: jbhusson <jonah@elixxir.io>
Date: Mon, 25 Oct 2021 15:41:11 -0400
Subject: [PATCH] Rename upsertEphemeral to insertEphemeral

---
 storage/database.go     | 2 +-
 storage/databaseImpl.go | 2 +-
 storage/mapImpl.go      | 2 +-
 storage/mapImpl_test.go | 8 ++++----
 storage/storage.go      | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/storage/database.go b/storage/database.go
index 04785da..d74a66d 100644
--- a/storage/database.go
+++ b/storage/database.go
@@ -17,7 +17,7 @@ type database interface {
 	GetAllUsers() ([]*User, error)
 	DeleteUserByHash(transmissionRsaHash []byte) error
 
-	upsertEphemeral(ephemeral *Ephemeral) error
+	insertEphemeral(ephemeral *Ephemeral) error
 	GetEphemeral(ephemeralId int64) ([]*Ephemeral, error)
 	GetLatestEphemeral() (*Ephemeral, error)
 	DeleteOldEphemerals(currentEpoch int32) error
diff --git a/storage/databaseImpl.go b/storage/databaseImpl.go
index b3c6491..7766a20 100644
--- a/storage/databaseImpl.go
+++ b/storage/databaseImpl.go
@@ -67,7 +67,7 @@ func (impl *DatabaseImpl) GetAllUsers() ([]*User, error) {
 	return dest, impl.db.Find(&dest).Error
 }
 
-func (impl *DatabaseImpl) upsertEphemeral(ephemeral *Ephemeral) error {
+func (impl *DatabaseImpl) insertEphemeral(ephemeral *Ephemeral) error {
 	return impl.db.Create(&ephemeral).Error
 }
 
diff --git a/storage/mapImpl.go b/storage/mapImpl.go
index 6cbb2ad..17b6ec6 100644
--- a/storage/mapImpl.go
+++ b/storage/mapImpl.go
@@ -95,7 +95,7 @@ func (m *MapImpl) GetAllUsers() ([]*User, error) {
 	return m.allUsers, nil
 }
 
-func (m *MapImpl) upsertEphemeral(ephemeral *Ephemeral) error {
+func (m *MapImpl) insertEphemeral(ephemeral *Ephemeral) error {
 	m.ephIDSeq++
 	ephemeral.ID = uint(m.ephIDSeq)
 	m.ephemeralsById[ephemeral.EphemeralId] = append(m.ephemeralsById[ephemeral.EphemeralId], ephemeral)
diff --git a/storage/mapImpl_test.go b/storage/mapImpl_test.go
index 5f23a71..1343ac9 100644
--- a/storage/mapImpl_test.go
+++ b/storage/mapImpl_test.go
@@ -311,7 +311,7 @@ func TestMapImpl_UpsertEphemeral(t *testing.T) {
 		t.Errorf("Failed to create ephemeral ID: %+v", err)
 	}
 
-	err = m.upsertEphemeral(&Ephemeral{
+	err = m.insertEphemeral(&Ephemeral{
 		Offset:              0,
 		TransmissionRSAHash: trsaHash,
 		EphemeralId:         eid.Int64(),
@@ -361,7 +361,7 @@ func TestMapImpl_GetEphemeral(t *testing.T) {
 		t.Errorf("FAiled to create ephemeral ID: %+v", err)
 	}
 
-	err = m.upsertEphemeral(&Ephemeral{
+	err = m.insertEphemeral(&Ephemeral{
 		Offset:              0,
 		TransmissionRSAHash: trsaHash,
 		EphemeralId:         eid.Int64(),
@@ -408,7 +408,7 @@ func TestMapImpl_DeleteOldEphemerals(t *testing.T) {
 		t.Errorf("FAiled to create ephemeral ID: %+v", err)
 	}
 
-	err = m.upsertEphemeral(&Ephemeral{
+	err = m.insertEphemeral(&Ephemeral{
 		Offset:              0,
 		TransmissionRSAHash: trsaHash,
 		EphemeralId:         eid.Int64(),
@@ -462,7 +462,7 @@ func TestMapImpl_GetLatestEphemeral(t *testing.T) {
 		t.Errorf("FAiled to create ephemeral ID: %+v", err)
 	}
 
-	err = m.upsertEphemeral(&Ephemeral{
+	err = m.insertEphemeral(&Ephemeral{
 		Offset:              0,
 		TransmissionRSAHash: trsaHash,
 		EphemeralId:         eid.Int64(),
diff --git a/storage/storage.go b/storage/storage.go
index 6e07504..aa56314 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -55,7 +55,7 @@ func (s *Storage) AddLatestEphemeral(u *User, epoch int32, size uint) (*Ephemera
 		Epoch:               epoch,
 		Offset:              u.OffsetNum,
 	}
-	err = s.upsertEphemeral(e)
+	err = s.insertEphemeral(e)
 	if err != nil {
 		return nil, err
 	}
@@ -71,7 +71,7 @@ func (s *Storage) AddLatestEphemeral(u *User, epoch int32, size uint) (*Ephemera
 			Epoch:               epoch + 1,
 			Offset:              u.OffsetNum,
 		}
-		err = s.upsertEphemeral(e)
+		err = s.insertEphemeral(e)
 		if err != nil {
 			return nil, err
 		}
@@ -105,7 +105,7 @@ func (s *Storage) AddEphemeralsForOffset(offset int64, epoch int32, size uint, t
 		if err != nil {
 			return errors.WithMessage(err, "Failed to get eid for user")
 		}
-		err = s.upsertEphemeral(&Ephemeral{
+		err = s.insertEphemeral(&Ephemeral{
 			TransmissionRSAHash: u.TransmissionRSAHash,
 			EphemeralId:         eid.Int64(),
 			Epoch:               epoch,
-- 
GitLab