Merge pull request #2427 from area363/remove-monster-collection-state

remove monster collection
planetarium · Mar 12, 2024 · 672c823 · 672c823
2 parents c989b58 + 89fe8b7
commit 672c823
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 38 deletions.
diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
@@ -345,7 +345,7 @@ public async Task SubscribeBalanceByAgent(int major, int minor, string decimalSt
             Currency currency = Currency.Legacy("NCG", 2, null);
 #pragma warning restore CS0618
             FungibleAssetValue fungibleAssetValue = new FungibleAssetValue(currency, major, minor);
-            StandaloneContextFx.AgentAddresses[address].balanceSubject.OnNext(fungibleAssetValue.GetQuantityString(true));
+            StandaloneContextFx.AgentAddresses[address].OnNext(fungibleAssetValue.GetQuantityString(true));
             ExecutionResult rawEvents = await stream.Take(1);
             var data = ((RootExecutionNode)rawEvents.Data.GetValue()).SubFields![0].Result!;
             Assert.Equal(decimalString, data);

diff --git a/NineChronicles.Headless/GraphTypes/StandaloneSubscription.cs b/NineChronicles.Headless/GraphTypes/StandaloneSubscription.cs
@@ -234,18 +234,16 @@ private IObservable<string> SubscribeBalance(IResolveEventStreamContext context)
         {
             var address = context.GetArgument<Address>("address");
 
-            StandaloneContext.AgentAddresses.TryAdd(address,
-                (new ReplaySubject<MonsterCollectionStatus>(), new ReplaySubject<MonsterCollectionState>(),
-                    new ReplaySubject<string>()));
+            StandaloneContext.AgentAddresses.TryAdd(address, new ReplaySubject<string>());
             StandaloneContext.AgentAddresses.TryGetValue(address, out var subjects);
 
             return Observable.Create<string>(observer =>
             {
-                var subscription = subjects.balanceSubject.Subscribe(observer);
+                var subscription = subjects?.Subscribe(observer);
 
                 return Disposable.Create(() =>
                 {
-                    subscription.Dispose();
+                    subscription?.Dispose();
                     StandaloneContext.AgentAddresses.TryRemove(address, out _);
                 });
             });
@@ -349,16 +347,14 @@ private void RenderBlock((Block OldTip, Block NewTip) pair)
                 .ForAll(kv =>
                 {
                     Address address = kv.Key;
-                    (ReplaySubject<MonsterCollectionStatus> statusSubject, _, ReplaySubject<string> balanceSubject) =
+                    ReplaySubject<string> balanceSubject =
                         kv.Value;
                     RenderForAgent(
                         blockChain,
                         _tipHeader,
                         address,
                         currency,
-                        statusSubject,
-                        balanceSubject,
-                        rewardSheet
+                        balanceSubject
                     );
                 });
 
@@ -371,34 +367,10 @@ private void RenderForAgent(
             BlockHeader tipHeader,
             Address address,
             Currency currency,
-            ReplaySubject<MonsterCollectionStatus> statusSubject,
-            ReplaySubject<string> balanceSubject,
-            MonsterCollectionRewardSheet rewardSheet)
+            ReplaySubject<string> balanceSubject)
         {
             FungibleAssetValue agentBalance = blockChain.GetWorldState(tipHeader.Hash).GetBalance(address, currency);
             balanceSubject.OnNext(agentBalance.GetQuantityString(true));
-            if (blockChain.GetWorldState(tipHeader.Hash).GetAgentState(address) is { } agentState)
-            {
-                Address deriveAddress =
-                    MonsterCollectionState.DeriveAddress(address, agentState.MonsterCollectionRound);
-                if (agentState.avatarAddresses.Any() &&
-                    blockChain.GetWorldState(tipHeader.Hash).GetLegacyState(deriveAddress) is Dictionary collectDict)
-                {
-                    var monsterCollectionState = new MonsterCollectionState(collectDict);
-                    List<MonsterCollectionRewardSheet.RewardInfo> rewards = monsterCollectionState.CalculateRewards(
-                        rewardSheet,
-                        tipHeader.Index
-                    );
-
-                    var monsterCollectionStatus = new MonsterCollectionStatus(
-                        agentBalance,
-                        rewards,
-                        tipHeader.Index,
-                        monsterCollectionState.IsLocked(tipHeader.Index)
-                    );
-                    statusSubject.OnNext(monsterCollectionStatus);
-                }
-            }
         }
     }
 }
diff --git a/NineChronicles.Headless/StandaloneContext.cs b/NineChronicles.Headless/StandaloneContext.cs
@@ -31,10 +31,9 @@ public class StandaloneContext
         public NineChroniclesNodeService? NineChroniclesNodeService { get; set; }
 
         public ConcurrentDictionary<Address,
-                (ReplaySubject<MonsterCollectionStatus> statusSubject, ReplaySubject<MonsterCollectionState> stateSubject, ReplaySubject<string> balanceSubject)>
+                ReplaySubject<string>>
             AgentAddresses
-        { get; } = new ConcurrentDictionary<Address,
-            (ReplaySubject<MonsterCollectionStatus>, ReplaySubject<MonsterCollectionState>, ReplaySubject<string>)>();
+        { get; } = new ConcurrentDictionary<Address, ReplaySubject<string>>();
 
         public NodeStatusType NodeStatus => new(this)
         {