multi: fix linter issues, go.mod re-init

Author: Roasbeef

go.mod

@@ -39,6 +39,7 @@ require (
 	golang.org/x/net v0.17.0
 	golang.org/x/sync v0.2.0
 	golang.org/x/term v0.13.0
+	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
 	google.golang.org/grpc v1.56.3
 	google.golang.org/protobuf v1.30.0
 	gopkg.in/macaroon-bakery.v2 v2.1.0
@@ -187,7 +188,6 @@ require (
 	golang.org/x/mod v0.10.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
 	golang.org/x/tools v0.9.1 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	gopkg.in/errgo.v1 v1.0.1 // indirect

tapdb/multiverse.go

@@ -170,7 +170,7 @@ func (p *proofCache) insertProof(id universe.Identifier,
 		id.StringForLog(), leafKey, proofKey[:])
 
 	proofVal := cachedProof(proof)
-	assetProofCache.Put(proofKey, &proofVal)
+	_, _ = assetProofCache.Put(proofKey, &proofVal)
 }
 
 // delProofsForAsset deletes all the proofs for the given asset.
@@ -215,15 +215,15 @@ type rootPageCache = lru.Cache[rootPageQuery, universeRootPage]
 type atomicRootCache = atomic.Pointer[rootPageCache]
 
 // newAtomicRootCache creates a new atomic root cache.
-func newAtomicRootCache() atomicRootCache {
+func newAtomicRootCache() *atomicRootCache {
 	rootCache := lru.NewCache[rootPageQuery, universeRootPage](
 		numCachedProofs,
 	)
 
 	var a atomicRootCache
 	a.Store(rootCache)
 
-	return a
+	return &a
 }
 
 // rootIndex maps a tree ID to a universe root.
@@ -233,21 +233,21 @@ type rootIndex = lnutils.SyncMap[treeID, *universe.Root]
 type atomicRootIndex = atomic.Pointer[rootIndex]
 
 // newAtomicRootIndex creates a new atomic root index.
-func newAtomicRootIndex() atomicRootIndex {
+func newAtomicRootIndex() *atomicRootIndex {
 	var a atomicRootIndex
 	a.Store(&rootIndex{})
 
-	return a
+	return &a
 }
 
 // rootNodeCache is used to cache the set of active root nodes for the
 // multiverse tree.
 type rootNodeCache struct {
 	sync.RWMutex
 
-	rootIndex atomicRootIndex
+	rootIndex *atomicRootIndex
 
-	allRoots atomicRootCache
+	allRoots *atomicRootCache
 
 	*cacheLogger
 
@@ -321,10 +321,12 @@ func (r *rootNodeCache) cacheRoots(q universe.RootNodesQuery,
 
 	// Store the main root pointer, then update the root index.
 	rootPageCache := r.allRoots.Load()
-	rootPageCache.Put(newRootPageQuery(q), rootNodes)
+	_, _ = rootPageCache.Put(newRootPageQuery(q), rootNodes)
 
 	rootIndex := r.rootIndex.Load()
 	for _, rootNode := range rootNodes {
+		rootNode := rootNode
+
 		idStr := treeID(rootNode.ID.String())
 		rootIndex.Store(idStr, &rootNode)
 	}
@@ -451,11 +453,11 @@ func (u *universeLeafCache) cacheLeafKeys(q universe.UniverseLeafKeysQuery,
 		}
 
 		// Store the cache in the top level cache.
-		u.leafCache.Put(idStr, pageCache)
+		_, _ = u.leafCache.Put(idStr, pageCache)
 	}
 
 	// Add the to the page cache.
-	pageCache.Put(newLeafQuery(q), &cachedKeys)
+	_, _ = pageCache.Put(newLeafQuery(q), &cachedKeys)
 }
 
 // wipeCache wipes the cache of leaf keys for a given universe ID.

tapdb/universe_federation.go

@@ -142,8 +142,8 @@ type UniverseFederationDB struct {
 
 	clock clock.Clock
 
-	globalCfg atomic.Pointer[globalSyncCfgs]
-	assetCfgs atomic.Pointer[assetSyncCfgs]
+	globalCfg *atomic.Pointer[globalSyncCfgs]
+	assetCfgs *atomic.Pointer[assetSyncCfgs]
 }
 
 // NewUniverseFederationDB makes a new Universe federation DB.
@@ -161,8 +161,8 @@ func NewUniverseFederationDB(db BatchedUniverseServerStore,
 	return &UniverseFederationDB{
 		db:        db,
 		clock:     clock,
-		globalCfg: globalCfgPtr,
-		assetCfgs: assetCfgsPtr,
+		globalCfg: &globalCfgPtr,
+		assetCfgs: &assetCfgsPtr,
 	}
 }
 

tapdb/universe_stats.go

@@ -181,8 +181,8 @@ type atomicSyncStatsCache struct {
 	*cacheLogger
 }
 
-func newAtomicSyncStatsCache() atomicSyncStatsCache {
-	return atomicSyncStatsCache{
+func newAtomicSyncStatsCache() *atomicSyncStatsCache {
+	return &atomicSyncStatsCache{
 		cacheLogger: newCacheLogger("sync stats"),
 	}
 }
@@ -288,7 +288,7 @@ type UniverseStats struct {
 	eventsCacheLogger *cacheLogger
 
 	syncStatsMtx     sync.Mutex
-	syncStatsCache   atomicSyncStatsCache
+	syncStatsCache   *atomicSyncStatsCache
 	syncStatsRefresh *time.Timer
 }
 
@@ -710,7 +710,7 @@ func (u *UniverseStats) QueryAssetStatsPerDay(ctx context.Context,
 	}
 
 	// We have a fresh result, so we'll cache it now.
-	u.assetEventsCache.Put(query, results)
+	_, _ = u.assetEventsCache.Put(query, results)
 
 	return results, nil
 }

universe/base.go

@@ -178,7 +178,6 @@ func (a *Archive) UpsertProofLeaf(ctx context.Context, id Identifier,
 		if err := existingProof.Decode(bytes.NewReader(
 			issuanceProof.Leaf.RawProof,
 		)); err != nil {
-
 			return nil, err
 		}
 

universe/syncer.go

@@ -343,7 +343,6 @@ func (s *SimpleSyncer) syncRoot(ctx context.Context, remoteRoot Root,
 	if !isIssuanceTree {
 		transferLeaves := fn.Collect(transferLeafProofs)
 		sort.Slice(transferLeaves, func(i, j int) bool {
-
 			// We'll need to decode the block heights from the
 			// proof, so we'll make a record to do so.
 			var iBlockHeight, jBlockHeight uint32