cleanup / small linter fixes

Author: benleb

internal/collections/collection.go

@@ -103,7 +103,10 @@ func NewCollection(contractAddress common.Address, name string, nodes *provider.
 
 				// cache collection name
 				// gbCache.CacheCollectionName(contractAddress, collectionName)
-				rueidi.StoreContractName(ctx, contractAddress, collectionName)
+				err := rueidi.StoreContractName(ctx, contractAddress, collectionName)
+				if err != nil {
+					gbl.Log.Errorf("error storing contract name: %s | %s", style.ShortenAddress(&contractAddress), err)
+				}
 			}
 
 		default:

internal/collections/collectiondb.go

@@ -37,7 +37,7 @@ func (cs *CollectionDB) OpenseaSlugsAndAddresses() map[string]common.Address {
 	slugAddresses := make(map[string]common.Address, 0)
 
 	for _, c := range cs.Collections {
-		if slug := c.OpenseaSlug; slug != "" && !c.IgnorePrinting && c.Show.Listings {
+		if slug := c.OpenseaSlug; slug != "" && !c.IgnorePrinting { // && c.Show.Listings {
 			slugAddresses[slug] = c.ContractAddress
 		}
 	}

internal/nemo/provider/pool.go

@@ -665,7 +665,10 @@ func (pp *Pool) ReverseResolveAddressToENS(ctx context.Context, address common.A
 
 	if ensName, ok := name.(string); err == nil && ok && ensName != "" {
 		// cache.StoreENSName(ctx, address, ensName)
-		pp.Rueidi.StoreENSName(ctx, address, ensName)
+		err := pp.Rueidi.StoreENSName(ctx, address, ensName)
+		if err != nil {
+			gbl.Log.Errorf("error storing ensName %s for address %s: %s", ensName, address.Hex(), err)
+		}
 
 		return ensName, nil
 	}
@@ -683,10 +686,13 @@ func (pp *Pool) ResolveENS(ctx context.Context, ensName string) (common.Address,
 
 	if err == nil && address != "" {
 		if addr, ok := address.(common.Address); ok {
+			err := pp.Rueidi.StoreENSName(ctx, addr, ensName)
+			if err != nil {
+				gbl.Log.Errorf("error storing ensName %s for address %s: %s", ensName, address, err)
+			}
+
 			return addr, nil
 		}
-		//		cache.StoreENSName(ctx, address, ensName)
-		//		return ensName, nil
 	}
 
 	if err != nil {

internal/pusu/pusu.go

@@ -55,6 +55,7 @@ func SubscribeToListings(gb *gloomberg.Gloomberg, queueTokenTransactions chan *t
 
 	// create a list of channels to subscribe to
 	channels := make([]string, 0)
+
 	for _, collectionAddress := range slugAddresses {
 		channelPattern := internal.TopicSeaWatcher + "/" + collectionAddress.String() + "/*"
 

internal/rueidica/rueidica.go

@@ -21,14 +21,12 @@ import (
 )
 
 const (
-	keywordContractName      string = "contractName"
-	keywordENS               string = "ensDomain"
-	keywordOSSlug            string = "osslug"
-	keywordBlurSlug          string = "blurslug"
-	keywordSalira            string = "salira"
-	keywordNotificationsLock string = "notification"
-	keyDelimiter             string = ":"
-	// keywordFloorPrice        string = "floor"
+	keywordContractName string = "contractName"
+	keywordENS          string = "ensDomain"
+	keywordOSSlug       string = "osslug"
+	keywordBlurSlug     string = "blurslug"
+	keywordSalira       string = "salira"
+	keyDelimiter        string = ":"
 )
 
 type Rueidica struct {
@@ -103,11 +101,12 @@ func (r *Rueidica) getCachedName(ctx context.Context, address common.Address, ke
 	if r != nil {
 		cachedName, err := r.DoCache(ctx, r.B().Get().Key(keyFunc(address)).Cache(), clientCacheTTL).ToString()
 
-		if err != nil && rueidis.IsRedisNil(err) {
+		switch {
+		case err != nil && rueidis.IsRedisNil(err):
 			gbl.Log.Debugf("rueidis | no name in cache for %s", address.Hex())
-		} else if err != nil {
+		case err != nil:
 			gbl.Log.Errorf("rueidis | error getting cached name: %s", err)
-		} else {
+		default:
 			gbl.Log.Debugf("rueidis | found name: %s -> %s", keyFunc(address), cachedName)
 		}
 
@@ -123,13 +122,14 @@ func (r *Rueidica) getCachedNumber(ctx context.Context, address common.Address,
 	if r != nil {
 		cachedNumber, err := r.DoCache(ctx, r.B().Get().Key(keyFunc(address)).Cache(), clientCacheTTL).ToString()
 
-		if err != nil && rueidis.IsRedisNil(err) {
+		switch {
+		case err != nil && rueidis.IsRedisNil(err):
 			gbl.Log.Debugf("rueidis | no number in cache for %s", address.Hex())
 
 			return 0, err
-		} else if err != nil {
+		case err != nil:
 			gbl.Log.Errorf("rueidis | error getting cached number: %s", err)
-		} else {
+		default:
 			gbl.Log.Debugf("rueidis | found number: %s -> %f", keyFunc(address), cachedNumber)
 		}
 
@@ -274,10 +274,6 @@ func keyENS(address common.Address) string {
 	return fmt.Sprint(address.Hex(), keyDelimiter, keywordENS)
 }
 
-func keyNotificationsLock(txID common.Hash) string {
-	return fmt.Sprint(txID.Hex(), keyDelimiter, keywordNotificationsLock)
-}
-
 func keyOSSlug(address common.Address) string {
 	return fmt.Sprint(address.Hex(), keyDelimiter, keywordOSSlug)
 }
@@ -289,7 +285,3 @@ func keyBlurSlug(address common.Address) string {
 func keySalira(address common.Address) string {
 	return fmt.Sprint(address.Hex(), keyDelimiter, keywordSalira)
 }
-
-// func KeyFloorPrice(address common.Address) string {
-// 	return fmt.Sprint(address.Hex(), keyDelimiter, keywordFloorPrice)
-// }

internal/trapri/trapri.go

@@ -117,6 +117,7 @@ func formatTokenTransaction(gb *gloomberg.Gloomberg, ttx *totra.TokenTransaction
 	// defaults
 	priceStyle := style.DarkWhiteStyle
 	priceArrowColor := style.DarkGray
+
 	if ttx.GetPrice().Ether() >= 0.01 {
 		priceArrowColor = style.GetPriceShadeColor(ttx.GetPrice().Ether())
 	}
@@ -253,6 +254,7 @@ func formatTokenTransaction(gb *gloomberg.Gloomberg, ttx *totra.TokenTransaction
 			// for erc1155 we get the current total supply of the token
 			// useful for mints, burns, etc., especially if they happen over a long* period of time
 			var fmtTotalSupply string
+
 			if transfer.Standard == standard.ERC1155 && (isOwnWallet || isOwnCollection || isWatchUsersWallet) {
 				// if supply, err := gb.Nodes.TotalSupplyERC1155(ctx, transfer.Token.Address, transfer.Token.ID); err == nil {
 				if supply, err := gb.ProviderPool.ERC1155TotalSupply(ctx, transfer.Token.Address, transfer.Token.ID); err == nil {
@@ -288,7 +290,6 @@ func formatTokenTransaction(gb *gloomberg.Gloomberg, ttx *totra.TokenTransaction
 					if numCollectionTokens == int64(len(transfers)) && ttx.From == sender {
 						// all tokens sold by the same address -> dumped into bids
 						// isBidDump = true
-
 						if numCollectionTokens > 5 || ttx.GetPrice().Ether() > 3.0 {
 							// if its a significant amount of tokens or ether we use a reddish style
 							numberStyle = style.TrendRedStyle
@@ -416,6 +417,7 @@ func formatTokenTransaction(gb *gloomberg.Gloomberg, ttx *totra.TokenTransaction
 
 	if len(fmtTokensTransferred) == 0 {
 		gbl.Log.Debugf("🧐 no tokens transferred: %s | %+v", style.TerminalLink(utils.GetEtherscanTxURL(txHash.String()), txHash.String()), ttx.Transfers)
+
 		for _, transfer := range ttx.Transfers {
 			gbl.Log.Debugf(
 				"  transfer of %dx %s | %+v",
@@ -492,6 +494,7 @@ func formatTokenTransaction(gb *gloomberg.Gloomberg, ttx *totra.TokenTransaction
 	// print sales for collection
 	if viper.GetBool("show.sales") {
 		out.WriteString(" | " + fmt.Sprintf("%dx", currentCollection.Counters.Sales) + style.BoldStyle.Render(""))
+
 		if currentCollection.Counters.Sales < 10 {
 			out.WriteString(" ")
 		}

internal/utils/slugs/slugs.go

@@ -12,6 +12,7 @@ import (
 	"github.com/benleb/gloomberg/internal/gbl"
 	"github.com/benleb/gloomberg/internal/opensea"
 	"github.com/benleb/gloomberg/internal/rueidica"
+	"github.com/benleb/gloomberg/internal/style"
 	"github.com/benleb/gloomberg/internal/utils"
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -35,7 +36,11 @@ func SlugWorker(slugTicker *time.Ticker, slugQueue *chan common.Address, rueidic
 		gbl.Log.Infof("fetching opensea slug for: %s", address.Hex())
 
 		if osslug := opensea.GetCollectionSlug(address); osslug != "" {
-			rueidica.StoreOSSlug(context.Background(), address, osslug)
+			err := rueidica.StoreOSSlug(context.Background(), address, osslug)
+			if err != nil {
+				gbl.Log.Errorf("error storing opensea slug: %s | %s", style.ShortenAddress(&address), err)
+			}
+
 			gbl.Log.Infof("caching opensea slug for: %s\n", address.Hex())
 		} else {
 			gbl.Log.Warnf("❌ fetching opensea slug for collection %s failed: no slug found", address.Hex())
@@ -46,7 +51,11 @@ func SlugWorker(slugTicker *time.Ticker, slugQueue *chan common.Address, rueidic
 		gbl.Log.Infof("fetching blur slug for: %s", address.Hex())
 
 		if blurslug, err := GetBlurSlugByName(address); err == nil && blurslug != "" {
-			rueidica.StoreBlurSlug(context.Background(), address, blurslug)
+			err := rueidica.StoreBlurSlug(context.Background(), address, blurslug)
+			if err != nil {
+				gbl.Log.Errorf("error storing blur slug: %s | %s", style.ShortenAddress(&address), err)
+			}
+
 			gbl.Log.Infof("caching blur slug for: %s\n", address.Hex())
 		} else {
 			gbl.Log.Warnf("❌ fetching blur slug for collection %s failed: no slug found", address.Hex())