close akkadotnet#3903

Aaronontheweb · Dec 8, 2022 · fbc338a · fbc338a
1 parent f34970d
commit fbc338a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/core/Akka.Remote.Tests/Serialization/MiscMessageSerializerSpec.cs b/src/core/Akka.Remote.Tests/Serialization/MiscMessageSerializerSpec.cs
@@ -93,7 +93,11 @@ public void Can_serialize_StatusSuccess(object payload)
         public void Can_serialize_StatusFailure(object payload)
         {
             var success = new Status.Failure(new ApplicationException("foo"),payload);
-            AssertEqual(success);
+            // can't use AssertEqual here since the Exception data isn't 100% identical after round-trip serialization
+            var deserialized = AssertAndReturn(success);
+            deserialized.State.Should().BeEquivalentTo(success.State);
+            deserialized.Cause.Message.Should().BeEquivalentTo(success.Cause.Message);
+            deserialized.Cause.Should().BeOfType(success.Cause.GetType());
         }
 
         [Fact]
@@ -392,7 +396,7 @@ private T AssertAndReturn<T>(T message)
         private void AssertEqual<T>(T message)
         {
             var deserialized = AssertAndReturn(message);
-            Assert.Equal(message, deserialized);
+            deserialized.Should().BeEquivalentTo(message);
         }
     }
 }
diff --git a/src/core/Akka.Remote/Configuration/Remote.conf b/src/core/Akka.Remote/Configuration/Remote.conf
@@ -39,8 +39,8 @@ akka {
       "Akka.Actor.PoisonPill, Akka" = akka-misc
       "Akka.Actor.Kill, Akka" = akka-misc
       "Akka.Actor.PoisonPill, Akka" = akka-misc
-      "Akka.Actor.Status.Failure, Akka" = akka-misc
-      "Akka.Actor.Status.Success, Akka" = akka-misc
+      "Akka.Actor.Status+Failure, Akka" = akka-misc
+      "Akka.Actor.Status+Success, Akka" = akka-misc
       #"Akka.Actor.LocalScope, Akka" = akka-misc
       "Akka.Actor.RemoteScope, Akka" = akka-misc
       "Akka.Routing.FromConfig, Akka" = akka-misc

diff --git a/src/core/Akka.Remote/Serialization/MiscMessageSerializer.cs b/src/core/Akka.Remote/Serialization/MiscMessageSerializer.cs
@@ -312,17 +312,14 @@ private byte[] StatusFailureToProto(Status.Failure failure)
         {
             var message = new Proto.Msg.StatusFailure();
             message.Cause = _exceptionSupport.ExceptionToProto(failure.Cause);
-            if(failure.State != null)
-                message.State = _payloadSupport.PayloadToProto(failure.State);
+            message.State = _payloadSupport.PayloadToProto(failure.State);
             return message.ToByteArray();
         }
 
         private Status.Failure StatusFailureFromProto(byte[] bytes)
         {
             var message = Proto.Msg.StatusFailure.Parser.ParseFrom(bytes);
-            object payload = string.Empty;
-            if(message.State != null)
-                payload = _payloadSupport.PayloadFrom(message.State);
+            var payload = _payloadSupport.PayloadFrom(message.State);
             return new Status.Failure(_exceptionSupport.ExceptionFromProto(message.Cause), payload);
         }