Sooo close, almost done this refactoring adventure

Author: abstrct

x/structs/keeper/agreement_cache.go

@@ -1,8 +1,6 @@
 package keeper
 
 import (
-	"context"
-
 	"structs/x/structs/types"
 
 	"cosmossdk.io/math"

x/structs/keeper/allocation.go

@@ -3,7 +3,6 @@ package keeper
 import (
 	//"encoding/binary"
     "context"
-    "strconv"
 
     "github.com/cosmos/cosmos-sdk/runtime"
 	"cosmossdk.io/store/prefix"

x/structs/keeper/fleet_cache.go

@@ -2,7 +2,7 @@ package keeper
 
 import (
 
-	"context"
+
     //"math"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/structs/keeper/guild_cache.go

@@ -1,7 +1,6 @@
 package keeper
 
 import (
-	"context"
 
 	"structs/x/structs/types"
 

x/structs/keeper/guild_membership_cache.go

@@ -1,7 +1,7 @@
 package keeper
 
 import (
-	"context"
+
 
 	"structs/x/structs/types"
 	//sdk "github.com/cosmos/cosmos-sdk/types"

x/structs/keeper/infusion.go

@@ -56,7 +56,7 @@ func (k Keeper) GetInfusionByID(ctx context.Context, infusionId string) (val typ
 	if len(infusionIdSplit) != 2 {
 		return types.Infusion{}, false
 	}
-	return k.GetInfusion(ctx, infusionIdSplit[0], infusionIdSplit[1])
+	return k.GetInfusion(ctx, infusionIdSplit[0] + "-" + infusionIdSplit[1], infusionIdSplit[2])
 }
 
 // RemoveInfusion removes a infusion from the store
@@ -112,6 +112,24 @@ func (k Keeper) GetAllInfusionsByDestination(ctx context.Context, objectId strin
 	return
 }
 
+
+// GetAllInfusionsByDestination returns all infusion relating to a struct
+func (k Keeper) GetAllInfusionIdsByDestination(ctx context.Context, objectId string) (list []string) {
+	store := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), InfusionKeyPrefix(objectId))
+	iterator := storetypes.KVStorePrefixIterator(store, []byte{})
+
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		var val types.Infusion
+		k.cdc.MustUnmarshal(iterator.Value(), &val)
+		allocationId := objectId + "-" + val.Address
+		list = append(list, allocationId)
+	}
+
+	return
+}
+
 func (k Keeper) GetInfusionDestructionQueue(ctx context.Context, clear bool) (queue []string) {
 	infusionDestructionQueueStore := prefix.NewStore(runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx)), types.KeyPrefix(types.InfusionDestructionQueue))
 	iterator := storetypes.KVStorePrefixIterator(infusionDestructionQueueStore, []byte{})

x/structs/keeper/infusion_cache.go

@@ -7,7 +7,7 @@ import (
 )
 
 type InfusionCache struct {
-    DestinationType types.ObjectType
+    InfusionId      string
     DestinationId   string
     Address         string
 
@@ -44,7 +44,7 @@ func (cache *InfusionCache) Commit() {
 func (cache *InfusionCache) IsChanged() bool { return cache.Changed }
 
 func (cache *InfusionCache) ID() string {
-    return cache.DestinationId + "/" + cache.Address
+    return cache.InfusionId
 }
 
 // =========================================================================
@@ -57,17 +57,6 @@ func (cache *InfusionCache) LoadInfusion() bool {
         cache.CC.ctx, cache.DestinationId, cache.Address,
     )
 
-    if !cache.InfusionLoaded {
-        cache.Infusion = types.Infusion{
-            DestinationType: cache.DestinationType,
-            DestinationId:   cache.DestinationId,
-            Address:         cache.Address,
-            PlayerId:        cache.GetOwnerId(),
-            Commission:      math.LegacyZeroDec(),
-        }
-        cache.InfusionLoaded = true
-    }
-
     return cache.InfusionLoaded
 }
 
@@ -82,6 +71,15 @@ func (cache *InfusionCache) GetOwnerId() string {
     return cache.Infusion.PlayerId
 }
 
+func (cache *InfusionCache) CheckInfusion() error  {
+    if !cache.InfusionLoaded {
+        if !cache.LoadInfusion() {
+            return types.NewObjectNotFoundError("infusion", cache.InfusionId)
+        }
+    }
+    return nil
+}
+
 func (cache *InfusionCache) GetInfusion() types.Infusion { if !cache.InfusionLoaded { cache.LoadInfusion() }; return cache.Infusion }
 func (cache *InfusionCache) GetInfusionId() string       { if !cache.InfusionLoaded { cache.LoadInfusion() }; return cache.DestinationId + "-" + cache.Address }
 func (cache *InfusionCache) GetPower() uint64             { if !cache.InfusionLoaded { cache.LoadInfusion() }; return cache.Infusion.Power }

x/structs/keeper/infusion_context.go

@@ -3,27 +3,46 @@ package keeper
 import (
     "structs/x/structs/types"
     "strings"
+    "cosmossdk.io/math"
 )
 
 
-func (cc *CurrentContext) GetInfusionById(infusionKey string) (*InfusionCache, bool) {
+func (cc *CurrentContext) GetInfusionById(infusionKey string) *InfusionCache {
+
     if cache, exists := cc.infusions[infusionKey]; exists {
-        return cache, exists
+        return cache
+    }
+
+	infusionIdSplit := strings.Split(infusionKey, "-")
+	if len(infusionIdSplit) != 3 {
+		return &InfusionCache{}
+	}
+
+    destinationId := infusionIdSplit[0] + "-" + infusionIdSplit[1]
+    address := infusionIdSplit[2]
+
+    cc.infusions[infusionKey] = &InfusionCache{
+        InfusionId:                     infusionKey,
+        DestinationId:                  destinationId,
+        Address:                        address,
+        CC:                             cc,
+        DestinationFuelAttributeId:     GetGridAttributeIDByObjectId(types.GridAttributeType_fuel, destinationId),
+        DestinationCapacityAttributeId: GetGridAttributeIDByObjectId(types.GridAttributeType_capacity, destinationId),
     }
 
-    return &InfusionCache{}, false
+    return cc.infusions[infusionKey]
 }
 
 
-func (cc *CurrentContext) GetInfusion(destinationType types.ObjectType, destinationId string, address string) *InfusionCache {
-    infusionKey := destinationId + "/" + address
+func (cc *CurrentContext) GetInfusion(destinationId string, address string) *InfusionCache {
+    infusionKey := destinationId + "-" + address
 
     if cache, exists := cc.infusions[infusionKey]; exists {
         return cache
     }
 
     cc.infusions[infusionKey] = &InfusionCache{
-        DestinationType:                destinationType,
+        InfusionId:                     infusionKey,
         DestinationId:                  destinationId,
         Address:                        address,
         CC:                             cc,
@@ -34,6 +53,34 @@ func (cc *CurrentContext) GetInfusion(destinationType types.ObjectType, destinat
     return cc.infusions[infusionKey]
 }
 
+func (cc *CurrentContext) GetAllInfusionByDestination(destinationId string) (infusions []*InfusionCache) {
+    infusionIds := cc.k.GetAllInfusionIdsByDestination(cc.ctx, destinationId)
+    for _, infusionId := range infusionIds {
+        infusion := cc.GetInfusionById(infusionId)
+        infusions = append(infusions, infusion)
+    }
+    return
+}
+
+func (cc *CurrentContext) UpsertInfusion(destinationType types.ObjectType, destinationId string, address string, playerId string) (*InfusionCache){
+    infusion := cc.GetInfusion(destinationId, address)
+
+    if infusion.CheckInfusion() != nil {
+        infusion.Infusion = types.Infusion{
+             DestinationId:      destinationId,
+             DestinationType:    destinationType,
+             Address:            address,
+             PlayerId:           playerId,
+             Commission:         math.LegacyZeroDec(),
+         }
+
+         infusion.InfusionLoaded = true
+         infusion.Changed = true
+    }
+    return infusion
+}
+
+
 func (cc *CurrentContext) ProcessInfusionDestructionQueue() {
     for {
         queue := cc.k.GetInfusionDestructionQueue(cc.ctx, true)
@@ -42,28 +89,18 @@ func (cc *CurrentContext) ProcessInfusionDestructionQueue() {
         }
 
         for _, infusionId := range queue {
-            // infusionId format: "destinationId-address" (e.g. "3-1-cosmos1abc...")
-            // destinationId itself contains "-", so split on the last dash
-            lastDash := strings.LastIndex(infusionId, "-")
-            if lastDash == -1 {
-                continue
-            }
-            destinationId := infusionId[:lastDash]
-            address := infusionId[lastDash+1:]
-
-            infusion, found := cc.k.GetInfusion(cc.ctx, destinationId, address)
-            if found && infusion.Power == 0 && infusion.Defusing == 0 {
-                cache := cc.GetInfusion(infusion.DestinationType, destinationId, address)
-                cache.Destroy()
+            infusion := cc.GetInfusionById(infusionId)
+            if (infusion.CheckInfusion() == nil && infusion.GetInfusion().Power == 0 && infusion.GetInfusion().Defusing == 0) {
+                infusion.Destroy()
             }
         }
     }
 }
 
 func (cc *CurrentContext) DestroyAllInfusions(infusionIds []string) {
 	for _, infusionId := range infusionIds {
-		infusion, found := cc.GetInfusionById(infusionId)
-		if found {
+		infusion := cc.GetInfusionById(infusionId)
+		if infusion.CheckInfusion() == nil {
 		    infusion.Destroy()
 		}
 	}

x/structs/keeper/msg_server_struct_generator_infuse.go

@@ -78,7 +78,7 @@ func (k msgServer) StructGeneratorInfuse(goCtx context.Context, msg *types.MsgSt
 	}
 	k.bankKeeper.BurnCoins(ctx, types.ModuleName, infusionAmount)
 
-	infusion := cc.GetInfusion(types.ObjectType_struct, structure.GetStructId(), callingPlayer.GetPrimaryAddress())
+	infusion := cc.UpsertInfusion(types.ObjectType_struct, structure.GetStructId(), callingPlayer.GetPrimaryAddress(), callingPlayer.GetPlayerId())
 
 	infusion.SetRatio(structure.GetStructType().GeneratingRate)
 	infusion.SetCommission(math.LegacyZeroDec())

x/structs/keeper/planet_attribute_cache.go

@@ -1,8 +1,5 @@
 package keeper
 
-import (
-	"structs/x/structs/types"
-)
 
 // attributeCache holds a single attribute value with change tracking.
 type PlanetAttributeCache struct {
@@ -11,6 +8,7 @@ type PlanetAttributeCache struct {
 	Value               uint64
 	Loaded              bool
 	Changed             bool
+	Deleted             bool
 }