Fix a bug when serializing default address

planetarium · Jul 24, 2019 · b96ade5 · b96ade5
1 parent 19078be
commit b96ade5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -42,6 +42,8 @@ To be released.
 
  -  Fixed a bug where the `LiteDBStore.IterateStagedTransactionIds()` returns
     duplicated transaction ids.  [[#366]]
+ -  Fixed a bug that `NullReferenceException` occurred when serializing default
+    `Address`.  [[#TBD]]
 
 
 [#343]: https://github.com/planetarium/libplanet/pull/343

diff --git a/Libplanet.Tests/AddressTest.cs b/Libplanet.Tests/AddressTest.cs
@@ -201,7 +201,7 @@ public void Equals_()
         }
 
         [Fact]
-        public void CanSerializeAndDeserialize()
+        public void SerializeAndDeserialize()
         {
             // Serialize and deserialize to and from memory
             var expectedAddress = new Address(
@@ -223,6 +223,21 @@ public void CanSerializeAndDeserialize()
             Assert.Equal(deserializedAddress, expectedAddress);
         }
 
+        [Fact]
+        public void SerializeAndDeserializeWithDefault()
+        {
+            var defaultAddress = default(Address);
+            BinaryFormatter formatter = new BinaryFormatter();
+
+            using (var memoryStream = new MemoryStream())
+            {
+                formatter.Serialize(memoryStream, defaultAddress);
+                memoryStream.Seek(0, SeekOrigin.Begin);
+                var deserializedAddress = (Address)formatter.Deserialize(memoryStream);
+                Assert.Equal(default, deserializedAddress);
+            }
+        }
+
         [Fact]
         public void Compare()
         {

diff --git a/Libplanet/Address.cs b/Libplanet/Address.cs
@@ -208,7 +208,7 @@ public void GetObjectData(
             SerializationInfo info,
             StreamingContext context)
         {
-            info.AddValue("address", _byteArray.ToArray());
+            info.AddValue("address", ToByteArray());
         }
 
         int IComparable<Address>.CompareTo(Address other)

diff --git a/Libplanet/Blockchain/BlockChain.cs b/Libplanet/Blockchain/BlockChain.cs
@@ -272,6 +272,7 @@ public AddressStateMap GetStates(
                                     ).GetValueOrDefault(a)
                                 ).ToArray();
 
+                            var l = new List<int>();
                             _rwlock.EnterWriteLock();
 
                             try