From a6c5886fb6ebdcef63d7822ad755cf06059bab05 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Sun, 6 Oct 2024 11:35:07 +0200
Subject: [PATCH] update to rmmi

---
 plugins/plugin_mfs_wip.cpp                                    | 2 +-
 src/convert_frag_to_obj.cpp                                   | 4 +++-
 .../message_fragment_store/message_fragment_store.cpp         | 2 +-
 .../message_fragment_store/message_fragment_store.hpp         | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/plugin_mfs_wip.cpp b/plugins/plugin_mfs_wip.cpp
index ac22607..7c18f57 100644
--- a/plugins/plugin_mfs_wip.cpp
+++ b/plugins/plugin_mfs_wip.cpp
@@ -35,7 +35,7 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 
 	try {
 		auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
-		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModel);
+		auto* rmm = PLUG_RESOLVE_INSTANCE(RegistryMessageModelI);
 		auto* os = PLUG_RESOLVE_INSTANCE(ObjectStore2);
 		auto* msnj = PLUG_RESOLVE_INSTANCE(MessageSerializerNJ);
 
diff --git a/src/convert_frag_to_obj.cpp b/src/convert_frag_to_obj.cpp
index 9700a01..3fb41e5 100644
--- a/src/convert_frag_to_obj.cpp
+++ b/src/convert_frag_to_obj.cpp
@@ -5,6 +5,8 @@
 #include <solanaceae/message_fragment_store/message_fragment_store.hpp>
 #include <solanaceae/message3/message_serializer.hpp>
 
+#include <solanaceae/message3/registry_message_model_impl.hpp>
+
 #include <solanaceae/util/utils.hpp>
 
 #include <nlohmann/json.hpp>
@@ -34,7 +36,7 @@ int main(int argc, const char** argv) {
 	Backends::FilesystemStorage fsb_dst(os_dst, argv[2]);
 
 	Contact3Registry cr; // dummy
-	RegistryMessageModel rmm(cr); // dummy
+	RegistryMessageModelImpl rmm(cr); // dummy
 	// they only exist for the serializers (for now)
 	// TODO: version
 	MessageSerializerNJ msnj_src{cr, {}, {}};
diff --git a/src/solanaceae/message_fragment_store/message_fragment_store.cpp b/src/solanaceae/message_fragment_store/message_fragment_store.cpp
index 9c72e38..2e6ad4e 100644
--- a/src/solanaceae/message_fragment_store/message_fragment_store.cpp
+++ b/src/solanaceae/message_fragment_store/message_fragment_store.cpp
@@ -481,7 +481,7 @@ bool MessageFragmentStore::syncFragToStorage(ObjectHandle fh, Message3Registry&
 
 MessageFragmentStore::MessageFragmentStore(
 	Contact3Registry& cr,
-	RegistryMessageModel& rmm,
+	RegistryMessageModelI& rmm,
 	ObjectStore2& os,
 	StorageBackendI& sb,
 	MessageSerializerNJ& scnj
diff --git a/src/solanaceae/message_fragment_store/message_fragment_store.hpp b/src/solanaceae/message_fragment_store/message_fragment_store.hpp
index 12b7248..caf635f 100644
--- a/src/solanaceae/message_fragment_store/message_fragment_store.hpp
+++ b/src/solanaceae/message_fragment_store/message_fragment_store.hpp
@@ -51,7 +51,7 @@ class MessageFragmentStore : public RegistryMessageModelEventI, public ObjectSto
 
 	protected:
 		Contact3Registry& _cr;
-		RegistryMessageModel& _rmm;
+		RegistryMessageModelI& _rmm;
 		ObjectStore2& _os;
 		StorageBackendI& _sb;
 		MessageSerializerNJ& _scnj;
@@ -87,7 +87,7 @@ class MessageFragmentStore : public RegistryMessageModelEventI, public ObjectSto
 	public:
 		MessageFragmentStore(
 			Contact3Registry& cr,
-			RegistryMessageModel& rmm,
+			RegistryMessageModelI& rmm,
 			ObjectStore2& os,
 			StorageBackendI& sb,
 			MessageSerializerNJ& scnj