Fixing refactoring bugs

Author: abstrct

x/structs/keeper/agreement_cache.go

@@ -46,17 +46,20 @@ func (cache *AgreementCache) Commit() {
     	cache.CC.k.logger.Info("Updating Agreement From Cache", "agreementId", cache.AgreementId)
 
     	if cache.Deleted {
-    	    // TODO MAKE SURE THE INDEX IS DELETED
+    	    cache.CC.k.RemoveAgreementProviderIndex(cache.CC.ctx, cache.GetProviderId(), cache.GetAgreementId())
+    	    cache.CC.k.RemoveAgreementExpirationIndex(cache.CC.ctx, cache.GetEndBlock(), cache.GetAgreementId())
+    	    if cache.EndBlockChanged && cache.PreviousEndBlock > 0 {
+                cache.CC.k.RemoveAgreementExpirationIndex(cache.CC.ctx, cache.PreviousEndBlock, cache.GetAgreementId())
+            }
     	    cache.CC.k.ClearAgreement(cache.CC.ctx, cache.AgreementId)
     	} else {
     		cache.CC.k.SetAgreement(cache.CC.ctx, cache.Agreement)
-    	}
-
-    	if (cache.EndBlockChanged) {
-    		if cache.PreviousEndBlock > 0 {
-                cache.CC.k.RemoveAgreementExpirationIndex(cache.CC.ctx, cache.PreviousEndBlock, cache.GetAgreementId())
-            }
-            cache.CC.k.SetAgreementExpirationIndex(cache.CC.ctx, cache.GetEndBlock(), cache.GetAgreementId())
+    		if (cache.EndBlockChanged) {
+    		    if cache.PreviousEndBlock > 0 {
+                    cache.CC.k.RemoveAgreementExpirationIndex(cache.CC.ctx, cache.PreviousEndBlock, cache.GetAgreementId())
+                }
+                cache.CC.k.SetAgreementExpirationIndex(cache.CC.ctx, cache.GetEndBlock(), cache.GetAgreementId())
+    		}
     	}
 
         cache.Changed = false

x/structs/keeper/allocation_cache.go

@@ -156,6 +156,7 @@ func (cache *AllocationCache) SetSource(sourceObjectId string) (error) {
     }
 
     cache.SetAllocationSourceObjectId(sourceObjectId)
+    cache.CC.k.SetAllocationSourceIndex(cache.CC.ctx, sourceObjectId, cache.ID())
     return nil
 }
 

x/structs/keeper/allocation_context.go

@@ -72,6 +72,8 @@ func (cc *CurrentContext) NewAllocation(
 
     allocation.Id               = GetObjectID(types.ObjectType_allocation, allocation.Index)
     allocation.Type             = allocationType
+    allocation.Creator          = creator
+    allocation.Controller       = controller
 
     allocationPowerAttributeId  := GetGridAttributeIDByObjectId(types.GridAttributeType_power, allocation.Id)
     sourceCapacityAttributeId   := GetGridAttributeIDByObjectId(types.GridAttributeType_capacity, sourceObjectId)

x/structs/keeper/current_context.go

@@ -215,7 +215,29 @@ func (cc *CurrentContext) CommitAll() {
         planetAttributeCache.Commit()
     }
 
+    for _, agreementCache := range cc.agreements {
+        agreementCache.Commit()
+    }
+
+    for _, planetCache := range cc.planets {
+        planetCache.Commit()
+    }
+
+    for _, providerCache := range cc.providers {
+        providerCache.Commit()
+    }
 
+    for _, structCache := range cc.structs {
+        structCache.Commit()
+    }
+
+    for _, substationCache := range cc.substations {
+        substationCache.Commit()
+    }
+
+    for _, reactorCache := range cc.reactors {
+        reactorCache.Commit()
+    }
 
 	cc.committed = true
     /*

x/structs/keeper/grid_context.go

@@ -131,17 +131,18 @@ func (cc *CurrentContext) GridCascade() {
             capacityAttributeId := GetGridAttributeIDByObjectId(types.GridAttributeType_capacity, objectId)
 
 			for cc.GetGridAttribute(loadAttributeId) > cc.GetGridAttribute(capacityAttributeId) {
+				if allocationPointer >= len(allocationList) {
+				    // Something is probably wrong here...
+				    cc.k.logger.Warn("Grid Queue problem", "objectId", objectId)
+				    break;
+				}
+
 				cc.k.logger.Info("Grid Queue (Brownout)", "objectId", objectId, "load", cc.GetGridAttribute(loadAttributeId), "capacity", cc.GetGridAttribute(capacityAttributeId))
 
 				allocationList[allocationPointer].Destroy()
 				cc.k.logger.Info("Grid Queue (Allocation Destroyed)", "allocationId", allocationList[allocationPointer].GetAllocationId())
 
 				allocationPointer++
-				if allocationPointer >= len(allocationList) {
-				    // Something is probably wrong here...
-				    cc.k.logger.Warn("Grid Queue problem", "objectId", objectId)
-				    break;
-				}
 			}
 		}
 	}

x/structs/keeper/guild_membership_context.go

@@ -13,6 +13,7 @@ func (cc *CurrentContext) GetGuildMembershipApp(guildId string, playerId string)
 
     cc.guildMembershipApps[appKey] = &GuildMembershipApplicationCache{
                                         GuildMembershipApplicationId: appKey,
+                                        CC: cc,
                                         Changed: false,
                                     }
 

x/structs/keeper/infusion.go

@@ -53,7 +53,7 @@ func (k Keeper) GetInfusion(ctx context.Context, destinationId string, address s
 // GetInfusion returns a infusion from its id (destinationId-address)
 func (k Keeper) GetInfusionByID(ctx context.Context, infusionId string) (val types.Infusion, found bool) {
 	infusionIdSplit := strings.Split(infusionId, "-")
-	if len(infusionIdSplit) != 2 {
+	if len(infusionIdSplit) != 3 {
 		return types.Infusion{}, false
 	}
 	return k.GetInfusion(ctx, infusionIdSplit[0] + "-" + infusionIdSplit[1], infusionIdSplit[2])

x/structs/keeper/msg_server_address_register.go

@@ -15,7 +15,6 @@ import (
 func (k msgServer) AddressRegister(goCtx context.Context, msg *types.MsgAddressRegister) (*types.MsgAddressRegisterResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	cc := k.NewCurrentContext(ctx)
-	defer cc.CommitAll()
 
     // Add an Active Address record to the
     // indexer for UI requirements
@@ -113,5 +112,6 @@ func (k msgServer) AddressRegister(goCtx context.Context, msg *types.MsgAddressR
     }
 
 
+	cc.CommitAll()
 	return &types.MsgAddressRegisterResponse{}, nil
 }

x/structs/keeper/msg_server_address_revoke.go

@@ -11,7 +11,6 @@ import (
 func (k msgServer) AddressRevoke(goCtx context.Context, msg *types.MsgAddressRevoke) (*types.MsgAddressRevokeResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	cc := k.NewCurrentContext(ctx)
-	defer cc.CommitAll()
 
     // Add an Active Address record to the
     // indexer for UI requirements
@@ -64,5 +63,6 @@ func (k msgServer) AddressRevoke(goCtx context.Context, msg *types.MsgAddressRev
     // Clear Address Index
     k.RevokePlayerIndexForAddress(ctx, msg.Address, player.GetIndex())
 
+	cc.CommitAll()
 	return &types.MsgAddressRevokeResponse{}, nil
 }

x/structs/keeper/msg_server_agreement_capacity_decrease.go

@@ -10,7 +10,6 @@ import (
 func (k msgServer) AgreementCapacityDecrease(goCtx context.Context, msg *types.MsgAgreementCapacityDecrease) (*types.MsgAgreementResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 	cc := k.NewCurrentContext(ctx)
-	defer cc.CommitAll()
 
     // Add an Active Address record to the
     // indexer for UI requirements
@@ -32,5 +31,6 @@ func (k msgServer) AgreementCapacityDecrease(goCtx context.Context, msg *types.M
         // which increases duration
     agreement.CapacityDecrease(msg.CapacityDecrease)
 
+	cc.CommitAll()
 	return &types.MsgAgreementResponse{}, nil
 }