move pending winners type to lib

fluidity-money · Dec 14, 2023 · 3e5b175 · 3e5b175
1 parent 20fffc7
commit 3e5b175
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/cmd/microservice-user-transactions-aggregate/main.go b/cmd/microservice-user-transactions-aggregate/main.go
@@ -8,12 +8,12 @@ import (
 	"math"
 	"math/big"
 
-	"github.com/fluidity-money/fluidity-app/lib/databases/timescale/spooler"
 	user_actions "github.com/fluidity-money/fluidity-app/lib/databases/timescale/user-actions"
 	"github.com/fluidity-money/fluidity-app/lib/log"
 	queue "github.com/fluidity-money/fluidity-app/lib/queues/user-actions"
 	"github.com/fluidity-money/fluidity-app/lib/queues/winners"
 	userActionsType "github.com/fluidity-money/fluidity-app/lib/types/user-actions"
+	winnerTypes "github.com/fluidity-money/fluidity-app/lib/types/winners"
 )
 
 func main() {
@@ -91,7 +91,7 @@ func main() {
     })
 
     // pending winners have the same behaviour as winners
-    winners.PendingWinners(func (pendingWinner spooler.PendingWinner) {
+    winners.PendingWinners(func (pendingWinner winnerTypes.PendingWinner) {
         var (
             network             = pendingWinner.Network
             transactionHash     = pendingWinner.TransactionHash.String()

diff --git a/lib/databases/timescale/spooler/spooler.go b/lib/databases/timescale/spooler/spooler.go
@@ -11,8 +11,6 @@ import (
 	"github.com/fluidity-money/fluidity-app/lib/log"
 	"github.com/fluidity-money/fluidity-app/lib/timescale"
 	"github.com/fluidity-money/fluidity-app/lib/types/applications"
-	"github.com/fluidity-money/fluidity-app/lib/types/ethereum"
-	"github.com/fluidity-money/fluidity-app/lib/types/misc"
 	"github.com/fluidity-money/fluidity-app/lib/types/network"
 	token_details "github.com/fluidity-money/fluidity-app/lib/types/token-details"
 	"github.com/fluidity-money/fluidity-app/lib/types/winners"
@@ -28,19 +26,7 @@ const (
 	TablePendingWinners = "ethereum_pending_winners"
 )
 
-type PendingWinner struct {
-	TokenDetails token_details.TokenDetails `json:"token_details"`
-	TransactionHash ethereum.Hash `json:"transaction_hash"`
-	SenderAddress ethereum.Address `json:"sender_address"`
-	NativeWinAmount misc.BigInt `json:"native_win_amount"`
-	UsdWinAmount float64 `json:"usd_win_amount"`
-	Utility applications.UtilityName `json:"utility"`
-	BlockNumber *misc.BigInt `json:"block_number"`
-	Network network.BlockchainNetwork `json:"network"`
-	RewardType winners.RewardType `json:"reward_type"`
-	LogIndex *misc.BigInt `json:"log_index"`
-	Application applications.Application `json:"application"`
-}
+type PendingWinner = winners.PendingWinner
 
 // CreatePendingWinners to aggregate a list of pending winners in the given announcement
 func CreatePendingWinners(winner worker.EthereumWinnerAnnouncement, tokenDetails map[applications.UtilityName]token_details.TokenDetails) []PendingWinner {

diff --git a/lib/queues/winners/winners.go b/lib/queues/winners/winners.go
@@ -82,7 +82,7 @@ func BlockedWinnersAll(f func(BlockedWinner)) {
 
 func PendingWinners(f func(spooler.PendingWinner)) {
 	queue.GetMessages(TopicPendingWinners, func(message queue.Message) {
-		var pendingWinner spooler.PendingWinner
+		var pendingWinner types.PendingWinner
 
 		message.Decode(&pendingWinner)
 

diff --git a/lib/types/winners/winners.go b/lib/types/winners/winners.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/fluidity-money/fluidity-app/lib/types/applications"
+	"github.com/fluidity-money/fluidity-app/lib/types/ethereum"
 	"github.com/fluidity-money/fluidity-app/lib/types/misc"
 	"github.com/fluidity-money/fluidity-app/lib/types/network"
 	"github.com/fluidity-money/fluidity-app/lib/types/token-details"
@@ -52,3 +53,19 @@ type BlockedWinner struct {
 	BatchFirstBlock         misc.BigInt                `json:"first_block"`
 	BatchLastBlock          misc.BigInt                `json:"last_block"`
 }
+
+// PendingWinner is a winner that has been spooled but not sent
+type PendingWinner struct {
+	TokenDetails token_details.TokenDetails `json:"token_details"`
+	TransactionHash ethereum.Hash `json:"transaction_hash"`
+	SenderAddress ethereum.Address `json:"sender_address"`
+	NativeWinAmount misc.BigInt `json:"native_win_amount"`
+	UsdWinAmount float64 `json:"usd_win_amount"`
+	Utility applications.UtilityName `json:"utility"`
+	BlockNumber *misc.BigInt `json:"block_number"`
+	Network network.BlockchainNetwork `json:"network"`
+	RewardType RewardType `json:"reward_type"`
+	LogIndex *misc.BigInt `json:"log_index"`
+	Application applications.Application `json:"application"`
+}
+