upgrade: Bencodex to 0.16.0

planetarium · Oct 27, 2023 · 3cee42e · 3cee42e
1 parent bcf5c78
commit 3cee42e
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 40 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -26,10 +26,19 @@ To be released.
 
 ### Dependencies
 
+ -  Upgrade *Bencodex* from [0.14.0][Bencodex 0.14.0] to
+    [0.16.0][Bencodex 0.16.0].  [[#3461]]
+ -  Upgrade *Bencodex.Json* from [0.11.0][Bencodex.Json 0.11.0] to
+    [0.16.0][Bencodex.Json 0.16.0].  [[#3461]]
+
 ### CLI tools
 
 [#3454]: https://github.com/planetarium/libplanet/pull/3454
 [#3455]: https://github.com/planetarium/libplanet/pull/3455
+[#3461]: https://github.com/planetarium/libplanet/pull/3461
+[Bencodex 0.16.0]: https://www.nuget.org/packages/Bencodex/0.16.0
+[Bencodex.Json 0.11.0]: https://www.nuget.org/packages/Bencodex.json/0.11.0
+[Bencodex.Json 0.16.0]: https://www.nuget.org/packages/Bencodex.json/0.16.0
 
 
 Version 3.6.0

diff --git a/Libplanet.Action/Libplanet.Action.csproj b/Libplanet.Action/Libplanet.Action.csproj
@@ -23,8 +23,8 @@
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.*" />
     <PackageReference Include="System.Text.Json" Version="6.0.*" />
-    <PackageReference Include="Bencodex" Version="0.14.0" />
-    <PackageReference Include="Bencodex.Json" Version="0.11.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
+    <PackageReference Include="Bencodex.Json" Version="0.16.0" />
     <PackageReference Include="Planetarium.LruCacheNet" Version="1.2.0" />
     <PackageReference Include="Serilog" Version="2.8.0" />
     <PackageReference Include="Menees.Analyzers.2017" Version="2.0.3">

diff --git a/Libplanet.Common/Libplanet.Common.csproj b/Libplanet.Common/Libplanet.Common.csproj
@@ -34,7 +34,7 @@
         runtime; build; native; contentfiles; analyzers; buildtransitive
       </IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Bencodex" Version="0.14.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.205">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>

diff --git a/Libplanet.Crypto/Libplanet.Crypto.csproj b/Libplanet.Crypto/Libplanet.Crypto.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.*" />
     <PackageReference Include="System.Text.Json" Version="6.0.*" />
-    <PackageReference Include="Bencodex" Version="0.14.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" />
     <PackageReference Include="Menees.Analyzers.2017" Version="2.0.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Libplanet.Explorer.Tests/GraphTypes/TransactionTypeTest.cs b/Libplanet.Explorer.Tests/GraphTypes/TransactionTypeTest.cs
@@ -63,7 +63,7 @@ await ExecuteQueryAsync(
             var actions = Assert.IsType<Dictionary<string, object>>(
                 ((object[])resultData["actions"])[0]);
             Assert.Equal(
-                transaction.Actions[0].Inspect(true),
+                transaction.Actions[0].Inspect(),
                 actions["inspection"]);
         }
     }

diff --git a/Libplanet.Explorer/GraphTypes/ActionType.cs b/Libplanet.Explorer/GraphTypes/ActionType.cs
@@ -50,7 +50,7 @@ public ActionType()
             Field<NonNullGraphType<StringGraphType>>(
                 name: "Inspection",
                 description: "A readable representation for debugging.",
-                resolve: ctx => ctx.Source.Inspect(true)
+                resolve: ctx => ctx.Source.Inspect()
             );
 
             Field<NonNullGraphType<StringGraphType>>(

diff --git a/Libplanet.Explorer/Libplanet.Explorer.csproj b/Libplanet.Explorer/Libplanet.Explorer.csproj
@@ -63,7 +63,7 @@
     <ProjectReference Include="..\Libplanet.Net\Libplanet.Net.csproj" />
     <ProjectReference Include="..\Libplanet\Libplanet.csproj" />
     <ProjectReference Include="..\Libplanet.RocksDBStore\Libplanet.RocksDBStore.csproj" />
-    <PackageReference Include="Bencodex.Json" Version="0.11.0" />
+    <PackageReference Include="Bencodex.Json" Version="0.16.0" />
     <!-- FIXME: We should specify the version range when the following NuGet
     issue is addressed: <https://github.com/NuGet/Home/issues/5556>. -->
   </ItemGroup>

diff --git a/Libplanet.Extensions.Cocona/Commands/ApvCommand.cs b/Libplanet.Extensions.Cocona/Commands/ApvCommand.cs
@@ -250,7 +250,7 @@ void TreeIntoTable(IValue tree, List<(string, string)> table, string key)
                         {
                             string k = kv.Key switch
                             {
-                                Binary bk => ByteUtil.Hex(bk),
+                                Binary bk => ByteUtil.Hex(bk.ToArray()),
                                 Text txt => txt.Value,
                                 _ => kv.Key.ToString() ?? string.Empty,
                             };

diff --git a/Libplanet.Store/BaseStore.cs b/Libplanet.Store/BaseStore.cs
@@ -191,7 +191,7 @@ ILogger logger
             {
                 const string msg = nameof(TxExecution) +
                     " must be serialized as a Bencodex dictionary, not {ActualValue}";
-                logger?.Error(msg, decoded.Inspect(false));
+                logger?.Error(msg, decoded.Inspect());
                 return null;
             }
 

diff --git a/Libplanet.Store/Libplanet.Store.csproj b/Libplanet.Store/Libplanet.Store.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.*" />
-    <PackageReference Include="Bencodex" Version="0.14.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
     <PackageReference Include="Caching.dll" Version="1.4.0.1" />
     <PackageReference Include="ImmutableTrie" Version="1.0.0-alpha" />
     <PackageReference Include="LiteDB" Version="4.1.4" />

diff --git a/Libplanet.Store/Trie/MerkleTrie.Path.cs b/Libplanet.Store/Trie/MerkleTrie.Path.cs
@@ -24,7 +24,7 @@ public partial class MerkleTrie
                         cursor),
                 HashNode hashNode => ResolveToValue(UnhashNode(hashNode), cursor),
                 _ => throw new InvalidTrieNodeException(
-                    $"Invalid node value: {node.ToBencodex().Inspect(false)}"),
+                    $"Invalid node value: {node.ToBencodex().Inspect()}"),
             };
 
         private INode? ResolveToNode(INode? node, in PathCursor cursor)

diff --git a/Libplanet.Store/Trie/MerkleTrie.cs b/Libplanet.Store/Trie/MerkleTrie.cs
@@ -308,7 +308,7 @@ private INode Insert(
 
                 default:
                     throw new InvalidTrieNodeException(
-                        $"Unsupported node value: {node.ToBencodex().Inspect(false)}");
+                        $"Unsupported node value: {node.ToBencodex().Inspect()}");
             }
         }
 

diff --git a/Libplanet.Store/Trie/Nodes/NodeDecoder.cs b/Libplanet.Store/Trie/Nodes/NodeDecoder.cs
@@ -62,7 +62,7 @@ public enum NodeType : short
                     return (allowed & NodeType.Full) == NodeType.Full
                         ? DecodeFull(list)
                         : throw new InvalidTrieNodeException(
-                            $"Can't decode a node from value {value.Inspect(false)}");
+                            $"Can't decode a node from value {value.Inspect()}");
                 }
                 else if (list.Count == 2)
                 {
@@ -71,45 +71,45 @@ public enum NodeType : short
                         return (allowed & NodeType.Short) == NodeType.Short
                             ? DecodeShort(list)
                             : throw new InvalidTrieNodeException(
-                                $"Can't decode a node from value {value.Inspect(false)}");
+                                $"Can't decode a node from value {value.Inspect()}");
                     }
                     else if (list[0] is Null)
                     {
                         return (allowed & NodeType.Value) == NodeType.Value
                             ? DecodeValue(list)
                             : throw new InvalidTrieNodeException(
-                                $"Can't decode a node from value {value.Inspect(false)}");
+                                $"Can't decode a node from value {value.Inspect()}");
                     }
                     else
                     {
                         throw new InvalidTrieNodeException(
-                                $"Can't decode a node from value {value.Inspect(false)}");
+                                $"Can't decode a node from value {value.Inspect()}");
                     }
                 }
                 else
                 {
                     throw new InvalidTrieNodeException(
-                        $"Can't decode a node from the bencodex value: {value.Inspect(false)}");
+                        $"Can't decode a node from the bencodex value: {value.Inspect()}");
                 }
             }
             else if (value is Binary binary)
             {
                 return (allowed & NodeType.Hash) == NodeType.Hash
                     ? DecodeHash(binary)
                     : throw new InvalidTrieNodeException(
-                        $"Can't decode a node from value {value.Inspect(false)}");
+                        $"Can't decode a node from value {value.Inspect()}");
             }
             else if (value is Null)
             {
                 return (allowed & NodeType.Null) == NodeType.Null
                     ? (INode?)null
                     : throw new InvalidTrieNodeException(
-                        $"Can't decode a node from value {value.Inspect(false)}");
+                        $"Can't decode a node from value {value.Inspect()}");
             }
             else
             {
                 throw new InvalidTrieNodeException(
-                    $"Can't decode a node from value {value.Inspect(false)}");
+                    $"Can't decode a node from value {value.Inspect()}");
             }
         }
 

diff --git a/Libplanet.Tests/Blocks/BlockMarshalerTest.cs b/Libplanet.Tests/Blocks/BlockMarshalerTest.cs
@@ -179,23 +179,23 @@ public void UnmarshalBlock()
             _output.WriteLine(
                 "{0} = {1}",
                 nameof(_marshaledGenesis),
-                _marshaledGenesis.Inspect(true));
+                _marshaledGenesis.Inspect());
             Assert.Equal(
                 _fx.Genesis,
                 BlockMarshaler.UnmarshalBlock(_marshaledGenesis)
             );
             _output.WriteLine(
                 "{0} = {1}",
                 nameof(_marshaledNext),
-                _marshaledNext.Inspect(true));
+                _marshaledNext.Inspect());
             Assert.Equal(
                 _fx.Next,
                 BlockMarshaler.UnmarshalBlock(_marshaledNext)
             );
             _output.WriteLine(
                 "{0} = {1}",
                 nameof(_marshaledHasTx),
-                _marshaledHasTx.Inspect(true));
+                _marshaledHasTx.Inspect());
             Assert.Equal(
                 _fx.HasTx,
                 BlockMarshaler.UnmarshalBlock(_marshaledHasTx)

diff --git a/Libplanet.Types/Libplanet.Types.csproj b/Libplanet.Types/Libplanet.Types.csproj
@@ -22,8 +22,8 @@
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.*" />
     <PackageReference Include="System.Text.Json" Version="6.0.*" />
-    <PackageReference Include="Bencodex" Version="0.14.0" />
-    <PackageReference Include="Bencodex.Json" Version="0.11.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
+    <PackageReference Include="Bencodex.Json" Version="0.16.0" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageReference Include="Menees.Analyzers.2017" Version="2.0.3">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Libplanet.Types/Tx/TxMarshaler.cs b/Libplanet.Types/Tx/TxMarshaler.cs
@@ -15,16 +15,16 @@ namespace Libplanet.Types.Tx
     public static class TxMarshaler
     {
         private const string TimestampFormat = "yyyy-MM-ddTHH:mm:ss.ffffffZ";
-        private static readonly Binary UpdatedAddressesKey = new byte[] { 0x75 }; // 'u'
-        private static readonly Binary TimestampKey = new byte[] { 0x74 }; // 't'
-        private static readonly Binary GenesisHashKey = new byte[] { 0x67 }; // 'g'
-        private static readonly Binary MaxGasPriceKey = new byte[] { 0x6d }; // 'm'
-        private static readonly Binary GasLimitKey = new byte[] { 0x6c }; // 'l'
-        private static readonly Binary NonceKey = new byte[] { 0x6e }; // 'n'
-        private static readonly Binary SignerKey = new byte[] { 0x73 }; // 's'
-        private static readonly Binary PublicKeyKey = new byte[] { 0x70 }; // 'p'
-        private static readonly Binary SignatureKey = new byte[] { 0x53 }; // 'S'
-        private static readonly Binary ActionsKey = new byte[] { 0x61 }; // 'a'
+        private static readonly Binary UpdatedAddressesKey = new Binary(new byte[] { 0x75 }); // 'u'
+        private static readonly Binary TimestampKey = new Binary(new byte[] { 0x74 }); // 't'
+        private static readonly Binary GenesisHashKey = new Binary(new byte[] { 0x67 }); // 'g'
+        private static readonly Binary MaxGasPriceKey = new Binary(new byte[] { 0x6d }); // 'm'
+        private static readonly Binary GasLimitKey = new Binary(new byte[] { 0x6c }); // 'l'
+        private static readonly Binary NonceKey = new Binary(new byte[] { 0x6e }); // 'n'
+        private static readonly Binary SignerKey = new Binary(new byte[] { 0x73 }); // 's'
+        private static readonly Binary PublicKeyKey = new Binary(new byte[] { 0x70 }); // 'p'
+        private static readonly Binary SignatureKey = new Binary(new byte[] { 0x53 }); // 'S'
+        private static readonly Binary ActionsKey = new Binary(new byte[] { 0x61 }); // 'a'
         private static readonly Codec Codec = new Codec();
 
         [Pure]
@@ -139,8 +139,8 @@ public static UnsignedTx UnmarshalUnsignedTx(Bencodex.Types.Dictionary dictionar
         public static ImmutableArray<byte>? UnmarshalTransactionSignature(
             Bencodex.Types.Dictionary dictionary
         ) =>
-            dictionary.TryGetValue(SignatureKey, out IValue v)
-                ? (Binary)v
+            dictionary.TryGetValue(SignatureKey, out IValue v) && v is Binary bin
+                ? bin.ToImmutableArray()
                 : (ImmutableArray<byte>?)null;
 
         [Pure]
@@ -182,8 +182,8 @@ public static Transaction UnmarshalTransactionWithoutVerification(
         {
             ImmutableArray<byte> sig
                 = dictionary.TryGetValue(SignatureKey, out IValue s) && s is Binary bin
-                ? bin
-                : new Binary(Array.Empty<byte>());
+                ? bin.ToImmutableArray()
+                : ImmutableArray<byte>.Empty;
             return UnmarshalUnsignedTx(dictionary).CombineWithoutVerification(sig);
         }
 

diff --git a/Libplanet/Libplanet.csproj b/Libplanet/Libplanet.csproj
@@ -64,7 +64,7 @@ https://docs.libplanet.io/</Description>
   <ItemGroup>
     <PackageReference Include="System.Collections.Immutable" Version="1.*" />
     <PackageReference Include="System.Text.Json" Version="6.0.*" />
-    <PackageReference Include="Bencodex" Version="0.14.0" />
+    <PackageReference Include="Bencodex" Version="0.16.0" />
     <PackageReference Include="BouncyCastle.Cryptography" Version="2.0.0" />
     <PackageReference Include="Serilog" Version="2.8.0" />
     <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />