ffi: Extract shared InMemory persister helpers

Author: spacebear21

payjoin-ffi/csharp/IntegrationTests.cs

@@ -11,25 +11,6 @@ public class IntegrationTests : IAsyncLifetime
         private TestServices? _services;
         private HttpClient? _httpClient;
 
-        private sealed class InMemoryReceiverPersister : JsonReceiverSessionPersister
-        {
-            private readonly List<string> _events = new();
-            public RpcClient? Connection { get; set; }
-
-            public void Save(string @event) => _events.Add(@event);
-            public string[] Load() => _events.ToArray();
-            public void Close() { }
-        }
-
-        private sealed class InMemorySenderPersister : JsonSenderSessionPersister
-        {
-            private readonly List<string> _events = new();
-
-            public void Save(string @event) => _events.Add(@event);
-            public string[] Load() => _events.ToArray();
-            public void Close() { }
-        }
-
         private sealed class MempoolAcceptanceCallback : CanBroadcast
         {
             private readonly RpcClient _connection;

payjoin-ffi/csharp/UnitTests.cs

@@ -42,88 +42,6 @@ public void ValidUrisWithDifferentAddressesAndEndpoints(string address, string p
     }
 }
 
-public class InMemoryReceiverPersister : JsonReceiverSessionPersister
-{
-    private List<string> _events = new();
-
-    public void Save(string @event)
-    {
-        _events.Add(@event);
-    }
-
-    public string[] Load()
-    {
-        return _events.ToArray();
-    }
-
-    public void Close()
-    {
-        // no-op for tests
-    }
-}
-
-public class InMemorySenderPersister : JsonSenderSessionPersister
-{
-    private List<string> _events = new();
-
-    public void Save(string @event)
-    {
-        _events.Add(@event);
-    }
-
-    public string[] Load()
-    {
-        return _events.ToArray();
-    }
-
-    public void Close()
-    {
-        // no-op for tests
-    }
-}
-
-public class InMemoryReceiverPersisterAsync : JsonReceiverSessionPersisterAsync
-{
-    private readonly List<string> _events = new();
-
-    public Task Save(string @event)
-    {
-        _events.Add(@event);
-        return Task.CompletedTask;
-    }
-
-    public Task<string[]> Load()
-    {
-        return Task.FromResult(_events.ToArray());
-    }
-
-    public Task Close()
-    {
-        return Task.CompletedTask;
-    }
-}
-
-public class InMemorySenderPersisterAsync : JsonSenderSessionPersisterAsync
-{
-    private readonly List<string> _events = new();
-
-    public Task Save(string @event)
-    {
-        _events.Add(@event);
-        return Task.CompletedTask;
-    }
-
-    public Task<string[]> Load()
-    {
-        return Task.FromResult(_events.ToArray());
-    }
-
-    public Task Close()
-    {
-        return Task.CompletedTask;
-    }
-}
-
 public class PersistenceTests
 {
     private static readonly byte[] OhttpKeysData = new byte[]

payjoin-ffi/csharp/Utils.cs

@@ -0,0 +1,64 @@
+namespace Payjoin.Tests;
+
+public abstract class MemoryEventLog
+{
+    private readonly List<string> _events = new();
+
+    public bool Closed { get; private set; }
+
+    public void Save(string @event)
+    {
+        _events.Add(@event);
+    }
+
+    public string[] Load()
+    {
+        return _events.ToArray();
+    }
+
+    public void Close()
+    {
+        Closed = true;
+    }
+}
+
+public abstract class MemoryEventLogAsync
+{
+    private readonly List<string> _events = new();
+
+    public bool Closed { get; private set; }
+
+    public Task Save(string @event)
+    {
+        _events.Add(@event);
+        return Task.CompletedTask;
+    }
+
+    public Task<string[]> Load()
+    {
+        return Task.FromResult(_events.ToArray());
+    }
+
+    public Task Close()
+    {
+        Closed = true;
+        return Task.CompletedTask;
+    }
+}
+
+public class InMemoryReceiverPersister : MemoryEventLog, JsonReceiverSessionPersister
+{
+    public RpcClient? Connection { get; set; }
+}
+
+public class InMemorySenderPersister : MemoryEventLog, JsonSenderSessionPersister
+{
+}
+
+public class InMemoryReceiverPersisterAsync : MemoryEventLogAsync, JsonReceiverSessionPersisterAsync
+{
+}
+
+public class InMemorySenderPersisterAsync : MemoryEventLogAsync, JsonSenderSessionPersisterAsync
+{
+}

payjoin-ffi/dart/test/test_payjoin_integration_test.dart

@@ -8,59 +8,13 @@ import "package:convert/convert.dart";
 import "package:payjoin/http.dart" as payjoin_http;
 import "package:payjoin/payjoin.dart" as payjoin;
 import "package:payjoin/test_utils.dart" as test_utils;
+import "utils.dart";
 
 late test_utils.BitcoindEnv env;
 late test_utils.BitcoindInstance bitcoind;
 late test_utils.RpcClient receiver;
 late test_utils.RpcClient sender;
 
-class InMemoryReceiverPersister
-    implements payjoin.JsonReceiverSessionPersister {
-  final String id;
-  final List<String> events = [];
-  bool closed = false;
-
-  InMemoryReceiverPersister(this.id);
-
-  @override
-  void save(String event) {
-    events.add(event);
-  }
-
-  @override
-  List<String> load() {
-    return events;
-  }
-
-  @override
-  void close() {
-    closed = true;
-  }
-}
-
-class InMemorySenderPersister implements payjoin.JsonSenderSessionPersister {
-  final String id;
-  final List<String> events = [];
-  bool closed = false;
-
-  InMemorySenderPersister(this.id);
-
-  @override
-  void save(String event) {
-    events.add(event);
-  }
-
-  @override
-  List<String> load() {
-    return events;
-  }
-
-  @override
-  void close() {
-    closed = true;
-  }
-}
-
 class MempoolAcceptanceCallback implements payjoin.CanBroadcast {
   final payjoin.RpcClient connection;
 
@@ -493,7 +447,7 @@ void main() {
       services.waitForServicesReady();
       final directory = services.directoryUrl();
       final ohttpKeys = services.fetchOhttpKeys();
-      final recvPersister = InMemoryReceiverPersister("prim");
+      final recvPersister = InMemoryReceiverPersister();
       final pjUri = payjoin.ReceiverBuilder(
         address: receiverAddress,
         directory: directory,
@@ -535,8 +489,8 @@ void main() {
 
       // **********************
       // Inside the Receiver:
-      var recv_persister = InMemoryReceiverPersister("1");
-      var sender_persister = InMemorySenderPersister("1");
+      var recv_persister = InMemoryReceiverPersister();
+      var sender_persister = InMemorySenderPersister();
       var session = create_receiver_context(
         receiver_address,
         directory,