Merge pull request #71 from LSViana/70-fix-unit-tests

Fix unit tests
y-crdt · Dec 3, 2023 · f933c59 · f933c59
2 parents fa16a7e + 7524a03
commit f933c59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/YDotNet/Document/UndoManagers/UndoManager.cs b/YDotNet/Document/UndoManagers/UndoManager.cs
@@ -4,6 +4,7 @@
 using YDotNet.Document.UndoManagers.Events;
 using YDotNet.Infrastructure;
 using YDotNet.Native.UndoManager;
+using YDotNet.Native.UndoManager.Events;
 
 namespace YDotNet.Document.UndoManagers;
 
@@ -31,7 +32,7 @@ public UndoManager(Doc doc, Branch branch, UndoManagerOptions? options = null)
             (_, action) =>
             {
                 UndoManagerChannel.ObserveAddedCallback callback =
-                    (_, undoEvent) => action(new UndoEvent(undoEvent));
+                    (_, handle) => action(new UndoEvent(MemoryReader.ReadStruct<UndoEventNative>(handle)));
 
                 return (UndoManagerChannel.ObserveAdded(Handle, nint.Zero, callback), callback);
             },
@@ -43,7 +44,7 @@ public UndoManager(Doc doc, Branch branch, UndoManagerOptions? options = null)
             (_, action) =>
             {
                 UndoManagerChannel.ObservePoppedCallback callback =
-                    (_, undoEvent) => action(new UndoEvent(undoEvent));
+                    (_, handle) => action(new UndoEvent(MemoryReader.ReadStruct<UndoEventNative>(handle)));
 
                 return (UndoManagerChannel.ObservePopped(Handle, nint.Zero, callback), callback);
             },

diff --git a/YDotNet/Native/UndoManager/Events/UndoEventNative.cs b/YDotNet/Native/UndoManager/Events/UndoEventNative.cs
@@ -1,8 +1,10 @@
+using System.Runtime.InteropServices;
 using YDotNet.Infrastructure;
 using YDotNet.Native.Document.State;
 
 namespace YDotNet.Native.UndoManager.Events;
 
+[StructLayout(LayoutKind.Sequential)]
 internal struct UndoEventNative
 {
     public UndoEventKindNative KindNative { get; set; }

diff --git a/YDotNet/Native/UndoManager/UndoManagerChannel.cs b/YDotNet/Native/UndoManager/UndoManagerChannel.cs
@@ -1,13 +1,12 @@
 using System.Runtime.InteropServices;
-using YDotNet.Native.UndoManager.Events;
 
 namespace YDotNet.Native.UndoManager;
 
 internal static class UndoManagerChannel
 {
-    public delegate void ObserveAddedCallback(nint state, UndoEventNative undoEvent);
+    public delegate void ObserveAddedCallback(nint state, nint eventHandle);
 
-    public delegate void ObservePoppedCallback(nint state, UndoEventNative undoEvent);
+    public delegate void ObservePoppedCallback(nint state, nint eventHandle);
 
     [DllImport(
         ChannelSettings.NativeLib,