Merge pull request #2251 from ipdae/main-merge-release-50

Main merge release 50
planetarium · Sep 19, 2023 · 84588ef · 84588ef
2 parents 4bdc943 + 368b434
commit 84588ef
Show file tree

Hide file tree

Showing 30 changed files with 318 additions and 595 deletions.
diff --git a/.gitallowed b/.gitallowed
@@ -0,0 +1,19 @@
+# For BUILD_GENESIS.md
+e87a05d05506b73570e80f6e99beeceae6a9891333b2e8e8951197050fad96e2
+
+# For ConversionCommandTest.cs
+a1262b4f0911a9cec5e64344c0c9b50d64f8781ade0e09fa79faaa127ccdff89
+
+# For ValidationCommandTest.cs
+ab8d591ccdcce263c39eb1f353e44b64869f0afea2df643bf6839ebde650d244
+d6c3e0d525dac340a132ae05aaa9f3e278d61b70d2b71326570e64aee249e566
+761f68d68426549df5904395b5ca5bce64a3da759085d8565242db42a5a1b0b9
+
+# For Fixtures.cs
+b934cb79757b1dec9f89caa01c4b791a6de6937dbecdc102fbdca217156cc2f5
+
+# For AddressQueryTest.cs
+b8ce43967d7270348906c3b30efd41c30ab834ce07a36ee8ac5fd52cb7a3f579
+
+# For StandaloneQueryTest.cs
+9330b3287bd2bbc38770c69ae7cd380350c60a1dff9ec41254f3048d5b3eb01c
diff --git a/Lib9c b/Lib9c
diff --git a/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs b/Libplanet.Headless.Tests/Hosting/LibplanetNodeServiceTest.cs
@@ -88,7 +88,7 @@ private class DummyAction : IAction
         {
             IValue IAction.PlainValue => Dictionary.Empty;
 
-            IAccountStateDelta IAction.Execute(IActionContext context)
+            IAccount IAction.Execute(IActionContext context)
             {
                 return context.PreviousState;
             }

diff --git a/Libplanet.Headless/ReducedStore.cs b/Libplanet.Headless/ReducedStore.cs
@@ -113,7 +113,6 @@ public void PutTxExecution(TxSuccess txSuccess)
                 txSuccess.BlockHash,
                 txSuccess.TxId,
                 updatedStates: txSuccess.UpdatedStates.ToImmutableDictionary(pair => pair.Key, _ => (IValue)Null.Value),
-                fungibleAssetsDelta: txSuccess.FungibleAssetsDelta,
                 updatedFungibleAssets: txSuccess.UpdatedFungibleAssets
             );
             InternalStore.PutTxExecution(reducedTxSuccess);

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ActionCommandTest.cs
@@ -198,7 +198,9 @@ public void ClaimStakeReward(string addressString, int expectedCode)
         [InlineData(ClaimStakeReward6.ObsoleteBlockIndex, typeof(ClaimStakeReward6))]
         [InlineData(ClaimStakeReward6.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward7))]
         [InlineData(ClaimStakeReward7.ObsoleteBlockIndex, typeof(ClaimStakeReward7))]
-        [InlineData(ClaimStakeReward7.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward))]
+        [InlineData(ClaimStakeReward7.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward8))]
+        [InlineData(ClaimStakeReward8.ObsoleteBlockIndex, typeof(ClaimStakeReward8))]
+        [InlineData(ClaimStakeReward8.ObsoleteBlockIndex + 1, typeof(ClaimStakeReward))]
         [InlineData(long.MaxValue, typeof(ClaimStakeReward))]
         public void ClaimStakeRewardWithBlockIndex(long blockIndex, Type expectedActionType)
         {
@@ -224,8 +226,8 @@ public void ClaimStakeRewardWithBlockIndex(long blockIndex, Type expectedActionT
 
         [Theory]
         [InlineData(0, 0, -1)]
-        [InlineData(1, 8, 0)]
-        [InlineData(9, 9, -1)]
+        [InlineData(1, 9, 0)]
+        [InlineData(10, 10, -1)]
         public void ClaimStakeRewardWithActionVersion(
             int actionVersionMin,
             int actionVersionMax,

diff --git a/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs b/NineChronicles.Headless.Executable.Tests/Commands/ChainCommandTest.cs
@@ -255,7 +255,7 @@ public void PruneState(StoreType storeType)
             _command.PruneStates(storeType, _storePath);
             IStore outputStore = storeType.CreateStore(_storePath);
             var outputStateKeyValueStore = new RocksDBKeyValueStore(statesPath);
-            var outputStateStore = new TrieStateStore(outputStateKeyValueStore, true);
+            var outputStateStore = new TrieStateStore(outputStateKeyValueStore);
             int outputStatesCount = outputStateKeyValueStore.ListKeys().Count();
             outputStore.Dispose();
             outputStateStore.Dispose();