refactor: return type

taikoxyz · Jul 26, 2024 · 47170bc · 47170bc
1 parent d310c3c
commit 47170bc
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 46 deletions.
diff --git a/adapters/logs.go b/adapters/logs.go
@@ -12,15 +12,6 @@ import (
 // TransferLogsIndexer is an interface that defines the methods for indexing and processing transfer logs.
 type TransferLogsIndexer interface {
 	Addresses() []common.Address
-	IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]TransferData, error)
-	ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*TransferData, error)
-}
-
-// TransferData represents an event with specific fields.
-type TransferData struct {
-	From        common.Address
-	To          common.Address
-	Value       *big.Int
-	Time        uint64
-	BlockNumber uint64
+	IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]Whitelist, error)
+	ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*Whitelist, error)
 }
diff --git a/adapters/logs/transfer_event.go b/adapters/logs/transfer_event.go
@@ -33,8 +33,8 @@ func (indexer *TransferIndexer) Addresses() []common.Address {
 }
 
 // IndexLogs processes logs for ERC20 transfers.
-func (indexer *TransferIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *TransferIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !isERC20Transfer(vLog) {
 			continue
@@ -53,7 +53,7 @@ func isERC20Transfer(vLog types.Log) bool {
 }
 
 // processLog processes a single ERC20 transfer log.
-func (indexer *TransferIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *TransferIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	to := common.BytesToAddress(vLog.Topics[2].Bytes()[12:])
 	from := common.BytesToAddress(vLog.Topics[1].Bytes()[12:])
 
@@ -75,9 +75,9 @@ func (indexer *TransferIndexer) ProcessLog(ctx context.Context, chainID *big.Int
 		return nil, err
 	}
 
-	return &adapters.TransferData{
+	return &adapters.Whitelist{
 		From:  from,
-		To:    to,
+		User:  to,
 		Time:  block.Time(),
 		Value: transferEvent.Value,
 	}, nil

diff --git a/adapters/projects/conft/token_sold.go b/adapters/projects/conft/token_sold.go
@@ -40,8 +40,8 @@ func (indexer *TokenSoldIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *TokenSoldIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *TokenSoldIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !indexer.isRelevantLog(vLog.Topics[0]) {
 			continue
@@ -59,7 +59,7 @@ func (indexer *TokenSoldIndexer) isRelevantLog(topic common.Hash) bool {
 	return topic.Hex() == logTokenSoldSigHash.Hex()
 }
 
-func (indexer *TokenSoldIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *TokenSoldIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	var tokenSoldEvent TokenSoldEvent
 
 	tokenSoldABI, err := abi.JSON(strings.NewReader(conft.ABI))
@@ -77,8 +77,8 @@ func (indexer *TokenSoldIndexer) ProcessLog(ctx context.Context, chainID *big.In
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          tokenSoldEvent.Buyer,
+	return &adapters.Whitelist{
+		User:        tokenSoldEvent.Buyer,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil

diff --git a/adapters/projects/domains/dot_taiko_register.go b/adapters/projects/domains/dot_taiko_register.go
@@ -33,8 +33,8 @@ func (indexer *DotTaikoIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *DotTaikoIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *DotTaikoIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !indexer.isRelevantLog(vLog.Topics[0]) {
 			continue
@@ -52,16 +52,16 @@ func (indexer *DotTaikoIndexer) isRelevantLog(topic common.Hash) bool {
 	return topic.Hex() == logNameRegisteredSigHash.Hex() || topic.Hex() == logMintedDomainSigHash.Hex() || topic.Hex() == logProfileCreatedSigHash.Hex()
 }
 
-func (indexer *DotTaikoIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *DotTaikoIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	ownerHex := common.BytesToAddress(vLog.Topics[2].Bytes()[12:])
 
 	block, err := client.BlockByNumber(ctx, big.NewInt(int64(vLog.BlockNumber)))
 	if err != nil {
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          ownerHex,
+	return &adapters.Whitelist{
+		User:        ownerHex,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil

diff --git a/adapters/projects/loopex/new_sale.go b/adapters/projects/loopex/new_sale.go
@@ -43,8 +43,8 @@ func (indexer *NewSaleIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *NewSaleIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *NewSaleIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !indexer.isRelevantLog(vLog.Topics[0]) {
 			continue
@@ -62,7 +62,7 @@ func (indexer *NewSaleIndexer) isRelevantLog(topic common.Hash) bool {
 	return topic.Hex() == logNewSaleSigHash.Hex()
 }
 
-func (indexer *NewSaleIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *NewSaleIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	var newSaleEvent NewSaleEvent
 
 	newSaleABI, err := abi.JSON(strings.NewReader(sale.ABI))
@@ -80,8 +80,8 @@ func (indexer *NewSaleIndexer) ProcessLog(ctx context.Context, chainID *big.Int,
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          newSaleEvent.Buyer,
+	return &adapters.Whitelist{
+		User:        newSaleEvent.Buyer,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil

diff --git a/adapters/projects/nfts2me/collection_created.go b/adapters/projects/nfts2me/collection_created.go
@@ -28,8 +28,8 @@ func (indexer *CollectionCreatedIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *CollectionCreatedIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *CollectionCreatedIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !isERC721Transfer(vLog) && !isFromZeroAddress(vLog) {
 			continue
@@ -53,16 +53,16 @@ func isFromZeroAddress(vLog types.Log) bool {
 }
 
 // processLog processes a single ERC20 transfer log.
-func (indexer *CollectionCreatedIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *CollectionCreatedIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	to := common.BytesToAddress(vLog.Topics[2].Bytes()[12:])
 
 	block, err := client.BlockByNumber(ctx, big.NewInt(int64(vLog.BlockNumber)))
 	if err != nil {
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          to,
+	return &adapters.Whitelist{
+		User:        to,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil

diff --git a/adapters/projects/okx/order_fulfilled.go b/adapters/projects/okx/order_fulfilled.go
@@ -56,8 +56,8 @@ func (indexer *OrderFulfilledIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *OrderFulfilledIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *OrderFulfilledIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !indexer.isRelevantLog(vLog.Topics[0]) {
 			continue
@@ -75,7 +75,7 @@ func (indexer *OrderFulfilledIndexer) isRelevantLog(topic common.Hash) bool {
 	return topic.Hex() == logOrderFulfilledSigHash.Hex()
 }
 
-func (indexer *OrderFulfilledIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *OrderFulfilledIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	var orderFulfilledEvent OrderFulfilledEvent
 
 	orderFulfilledABI, err := abi.JSON(strings.NewReader(order.ABI))
@@ -92,8 +92,8 @@ func (indexer *OrderFulfilledIndexer) ProcessLog(ctx context.Context, chainID *b
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          orderFulfilledEvent.Recipient,
+	return &adapters.Whitelist{
+		User:        orderFulfilledEvent.Recipient,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil

diff --git a/adapters/projects/omnihub/contract_deployed.go b/adapters/projects/omnihub/contract_deployed.go
@@ -29,8 +29,8 @@ func (indexer *ContractDeployedIndexer) Addresses() []common.Address {
 	return indexer.TargetAddresses
 }
 
-func (indexer *ContractDeployedIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.TransferData, error) {
-	var result []adapters.TransferData
+func (indexer *ContractDeployedIndexer) IndexLogs(ctx context.Context, chainID *big.Int, client *ethclient.Client, logs []types.Log) ([]adapters.Whitelist, error) {
+	var result []adapters.Whitelist
 	for _, vLog := range logs {
 		if !indexer.isRelevantLog(vLog.Topics[0]) {
 			continue
@@ -48,7 +48,7 @@ func (indexer *ContractDeployedIndexer) isRelevantLog(topic common.Hash) bool {
 	return topic.Hex() == logContractDeployedSigHash.Hex()
 }
 
-func (indexer *ContractDeployedIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.TransferData, error) {
+func (indexer *ContractDeployedIndexer) ProcessLog(ctx context.Context, chainID *big.Int, client *ethclient.Client, vLog types.Log) (*adapters.Whitelist, error) {
 	txn, err := client.TransactionInBlock(ctx, vLog.BlockHash, vLog.TxIndex)
 	if err != nil {
 		return nil, err
@@ -64,8 +64,8 @@ func (indexer *ContractDeployedIndexer) ProcessLog(ctx context.Context, chainID
 		return nil, err
 	}
 
-	return &adapters.TransferData{
-		To:          sender,
+	return &adapters.Whitelist{
+		User:        sender,
 		Time:        block.Time(),
 		BlockNumber: block.Number().Uint64(),
 	}, nil