Conflict resolve

planetarium · Jul 6, 2021 · 2b68661 · 2b68661
1 parent 46eb639
commit 2b68661
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -161,6 +161,8 @@ To be released.
     [[#1294], [#1328]]
  -  Added `IStore.IterateTxIdBlockHashIndex(TxId)` method.
     [[#1294], [#1328]]
+ -  Parameter `miner` for `Block<T>()` and `Block<T>.Mine()` can no longer be
+    `null`.  [[1341]]
  -  `Swarm<T>.StartAsync()` method became to receive `broadcastBlockInterval`
     (or `millisecondsBroadcastBlockInterval`) parameter.  [[#1351]]
 
@@ -318,6 +320,7 @@ To be released.
 [#1334]: https://github.com/planetarium/libplanet/pull/1334
 [#1339]: https://github.com/planetarium/libplanet/issues/1339
 [#1340]: https://github.com/planetarium/libplanet/pull/1340
+[#1341]: https://github.com/planetarium/libplanet/pull/1341
 [#1342]: https://github.com/planetarium/libplanet/pull/1342
 [#1343]: https://github.com/planetarium/libplanet/pull/1343
 [#1348]: https://github.com/planetarium/libplanet/pull/1348

diff --git a/Libplanet.Tests/Action/ActionEvaluatorTest.cs b/Libplanet.Tests/Action/ActionEvaluatorTest.cs
@@ -217,11 +217,11 @@ public void EvaluateWithCriticalException()
                 ? new AccountStateDeltaImpl(
                     ActionEvaluator<DumbAction>.NullAccountStateGetter,
                     ActionEvaluator<DumbAction>.NullAccountBalanceGetter,
-                    genesis.Miner.GetValueOrDefault())
+                    genesis.Miner)
                 : new AccountStateDeltaImplV0(
                     ActionEvaluator<DumbAction>.NullAccountStateGetter,
                     ActionEvaluator<DumbAction>.NullAccountBalanceGetter,
-                    genesis.Miner.GetValueOrDefault());
+                    genesis.Miner);
 
             // ToList() is required for realization.
             chain.ActionEvaluator.EvaluateTx(

diff --git a/Libplanet/Blocks/Block.cs b/Libplanet/Blocks/Block.cs
@@ -39,8 +39,8 @@ public class Block<T> : IBlockExcerpt
         /// See also <see cref="Difficulty"/>.</param>
         /// <param name="nonce">The nonce which satisfy the given <paramref name="difficulty"/> with
         /// any other field values.  Goes to the <see cref="Nonce"/>.</param>
-        /// <param name="miner">An optional address refers to who mines this block.
-        /// Goes to the <see cref="Miner"/>.</param>
+        /// <param name="miner">The <see cref="Address"/> of the miner of this block. Goes to the
+        /// <see cref="Miner"/>.</param>
         /// <param name="previousHash">The previous block's <see cref="Hash"/>.  If it's a genesis
         /// block (i.e., <paramref name="index"/> is 0) this should be <c>null</c>.
         /// Goes to the <see cref="PreviousHash"/>.</param>
@@ -348,7 +348,7 @@ public BlockHeader Header
         /// <see cref="Nonce"/>.</param>
         /// <param name="previousTotalDifficulty">The total difficulty until the previous
         /// <see cref="Block{T}"/>.</param>
-        /// <param name="miner">The <see cref="Address"/> of miner that mined the block.</param>
+        /// <param name="miner">The <see cref="Address"/> of miner that mines the block.</param>
         /// <param name="previousHash">
         /// The <see cref="HashDigest{SHA256}"/> of previous block.
         /// </param>