refactor(persistence): actorType set in getActorForRow

pokt-network · Jan 3, 2023 · 6ff3c3a · 6ff3c3a
1 parent fb42810
commit 6ff3c3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/persistence/actor.go b/persistence/actor.go
@@ -20,7 +20,7 @@ func (p PostgresContext) GetAllApps(height int64) (apps []*coreTypes.Actor, err
 	var actors []*coreTypes.Actor
 	for rows.Next() {
 		var actor *coreTypes.Actor
-		actor, height, err = p.getActorFromRow(rows)
+		actor, height, err = p.getActorFromRow(types.ApplicationActor.GetActorType(), rows)
 		if err != nil {
 			return
 		}
@@ -49,10 +49,11 @@ func (p PostgresContext) GetAllValidators(height int64) (vals []*coreTypes.Actor
 	var actors []*coreTypes.Actor
 	for rows.Next() {
 		var actor *coreTypes.Actor
-		actor, height, err = p.getActorFromRow(rows)
+		actor, height, err = p.getActorFromRow(types.ValidatorActor.GetActorType(), rows)
 		if err != nil {
 			return
 		}
+		actor.ActorType = types.ValidatorActor.GetActorType()
 		actors = append(actors, actor)
 	}
 	rows.Close()
@@ -78,7 +79,7 @@ func (p PostgresContext) GetAllServiceNodes(height int64) (sn []*coreTypes.Actor
 	var actors []*coreTypes.Actor
 	for rows.Next() {
 		var actor *coreTypes.Actor
-		actor, height, err = p.getActorFromRow(rows)
+		actor, height, err = p.getActorFromRow(types.ServiceNodeActor.GetActorType(), rows)
 		if err != nil {
 			return
 		}
@@ -107,7 +108,7 @@ func (p PostgresContext) GetAllFishermen(height int64) (f []*coreTypes.Actor, er
 	var actors []*coreTypes.Actor
 	for rows.Next() {
 		var actor *coreTypes.Actor
-		actor, height, err = p.getActorFromRow(rows)
+		actor, height, err = p.getActorFromRow(types.FishermanActor.GetActorType(), rows)
 		if err != nil {
 			return
 		}

diff --git a/persistence/shared_sql.go b/persistence/shared_sql.go
@@ -88,16 +88,17 @@ func (p *PostgresContext) getActor(actorSchema types.ProtocolActorSchema, addres
 	if err != nil {
 		return
 	}
-	actor, height, err = p.getActorFromRow(tx.QueryRow(ctx, actorSchema.GetQuery(hex.EncodeToString(address), height)))
+	actor, height, err = p.getActorFromRow(actorSchema.GetActorType(), tx.QueryRow(ctx, actorSchema.GetQuery(hex.EncodeToString(address), height)))
 	if err != nil {
 		return
 	}
-	actor.ActorType = actorSchema.GetActorType()
 	return p.getChainsForActor(ctx, tx, actorSchema, actor, height)
 }
 
-func (p *PostgresContext) getActorFromRow(row pgx.Row) (actor *coreTypes.Actor, height int64, err error) {
-	actor = new(coreTypes.Actor)
+func (p *PostgresContext) getActorFromRow(actorType coreTypes.ActorType, row pgx.Row) (actor *coreTypes.Actor, height int64, err error) {
+	actor = &coreTypes.Actor{
+		ActorType: actorType,
+	}
 	err = row.Scan(
 		&actor.Address,
 		&actor.PublicKey,