refactor: use statement instead of self-disposing on Delegatee

planetarium · Dec 3, 2024 · d72fe38 · d72fe38
1 parent a6856fa
commit d72fe38
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/Lib9c/Delegation/Delegatee.cs b/Lib9c/Delegation/Delegatee.cs
@@ -179,12 +179,13 @@ public virtual BigInteger Bond(T delegator, FungibleAssetValue fav, long height)
         {
             using var activity = ActivitySource.StartActivity("Bond");
 
-            var distributeRewardActivity = ActivitySource.StartActivity(
+            using (Activity? _ = ActivitySource.StartActivity(
                 "DistributeReward",
                 ActivityKind.Internal,
-                activity?.Id ?? string.Empty);
-            DistributeReward(delegator, height);
-            distributeRewardActivity?.Dispose();
+                activity?.Id ?? string.Empty))
+            {
+                DistributeReward(delegator, height);
+            }
 
             if (!fav.Currency.Equals(DelegationCurrency))
             {
@@ -240,12 +241,13 @@ public virtual BigInteger Bond(T delegator, FungibleAssetValue fav, long height)
             Repository.SetBond(bond);
             setBondActivity?.Dispose();
 
-            var startNewRewardPeriodActivity = ActivitySource.StartActivity(
+            using (Activity? _ = ActivitySource.StartActivity(
                 "StartNewRewardPeriod",
                 ActivityKind.Internal,
-                activity?.Id ?? string.Empty);
-            StartNewRewardPeriod(height);
-            startNewRewardPeriodActivity?.Dispose();
+                activity?.Id ?? string.Empty))
+            {
+                StartNewRewardPeriod(height);
+            }
 
             var setDelegateeMetadataActivity = ActivitySource.StartActivity(
                 "SetDelegateeMetadata",
@@ -266,12 +268,13 @@ public FungibleAssetValue Unbond(T delegator, BigInteger share, long height)
         {
             using var activity = ActivitySource.StartActivity("Unbond");
 
-            var distributeRewardActivity = ActivitySource.StartActivity(
+            using (Activity? _ = ActivitySource.StartActivity(
                 "DistributeReward",
                 ActivityKind.Internal,
-                activity?.Id ?? string.Empty);
-            DistributeReward(delegator, height);
-            distributeRewardActivity?.Dispose();
+                activity?.Id ?? string.Empty))
+            {
+                DistributeReward(delegator, height);
+            }
 
             if (TotalShares.IsZero || TotalDelegated.RawValue.IsZero)
             {
@@ -324,12 +327,13 @@ public FungibleAssetValue Unbond(T delegator, BigInteger share, long height)
             Repository.SetBond(bond);
             setBondActivity?.Dispose();
 
-            var startNewRewardPeriodActivity = ActivitySource.StartActivity(
+            using (Activity? _ = ActivitySource.StartActivity(
                 "StartNewRewardPeriod",
                 ActivityKind.Internal,
-                activity?.Id ?? string.Empty);
-            StartNewRewardPeriod(height);
-            startNewRewardPeriodActivity?.Dispose();
+                activity?.Id ?? string.Empty))
+            {
+                StartNewRewardPeriod(height);
+            }
 
             var setDelegateeMetadataActivity = ActivitySource.StartActivity(
                 "SetDelegateeMetadata",