WIP

obsidiansystems · Jul 21, 2024 · 1344bcd · 1344bcd
1 parent 48aa3bb
commit 1344bcd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
@@ -12,30 +12,28 @@ DummyStoreConfig::DummyStoreConfig(
         throw UsageError("`%s` store URIs must not contain an authority part %s", scheme, authority);
 }
 
-std::string DummyStoreConfig::doc()
+std::string DummyStoreConfig::doc() const
 {
     return
       #include "dummy-store.md"
       ;
 }
 
 
-const DummyStoreConfig::Descriptions DummyStoreConfig::descriptions{};
-
-
-struct DummyStore : public virtual DummyStoreConfig, public virtual Store
+struct DummyStore : virtual Store
 {
     using Config = DummyStoreConfig;
 
-    DummyStore(const Config & config)
-        : StoreConfig(config)
-        , DummyStoreConfig(config)
-        , Store{static_cast<const Store::Config &>(*this)}
+    ref<const Config> config;
+
+    DummyStore(ref<const Config> config)
+        : Store{*config}
+        , config(config)
     { }
 
     std::string getUri() override
     {
-        return *uriSchemes().begin();
+        return *Config::uriSchemes().begin() + "://";
     }
 
     void queryPathInfoUncached(const StorePath & path,
@@ -82,7 +80,7 @@ struct DummyStore : public virtual DummyStoreConfig, public virtual Store
 
 ref<Store> DummyStore::Config::openStore() const
 {
-    return make_ref<DummyStore>(*this);
+    return make_ref<DummyStore>(ref{shared_from_this()});
 }
 
 static RegisterStoreImplementation<DummyStore::Config> regDummyStore;

diff --git a/src/libstore/store-registration.cc b/src/libstore/store-registration.cc
@@ -123,11 +123,12 @@ ref<const StoreConfig> adl_serializer<ref<const StoreConfig>>::from_json(const j
 
     case json::value_t::object: {
         auto & obj = json.get_ref<const json::object_t &>();
-        ref = StoreReference {
-            .variant = StoreReference::Specified{
-                .scheme = getString(valueAt(obj, "scheme")),
-                .authority = getString(valueAt(obj, "authority")),
-            },
+        ref = StoreReference{
+            .variant =
+                StoreReference::Specified{
+                    .scheme = getString(valueAt(obj, "scheme")),
+                    .authority = getString(valueAt(obj, "authority")),
+                },
             .params = obj,
         };
         break;
@@ -143,8 +144,7 @@ ref<const StoreConfig> adl_serializer<ref<const StoreConfig>>::from_json(const j
     case json::value_t::discarded:
     default:
         throw UsageError(
-            "Invalid JSON for Store configuration: is type '%s' but must be string or object",
-            json.type_name());
+            "Invalid JSON for Store configuration: is type '%s' but must be string or object", json.type_name());
     };
 
     return resolveStoreConfig(std::move(ref));