@dxos/echo-db 2.33.5-dev.97a81dd0 → 2.33.5-dev.bbe0c471

package/src/halo/halo-factory.ts

@@ -93,21 +93,21 @@ export class HaloFactory {
      *    B. Device key (the first "member" of the Identity's HALO).
      *    C. Feed key (the feed owned by the Device).
      */
-    await halo.writeCredentialsMessage(createPartyGenesisMessage(this._keyring, identityKey, feedKeyPair.publicKey, deviceKey));
+    await halo.credentialsWriter.write(createPartyGenesisMessage(this._keyring, identityKey, feedKeyPair.publicKey, deviceKey));
 
     /* 3. Make a special self-signed KeyAdmit message which will serve as an "IdentityGenesis" message. This
      *    message will be copied into other Parties which we create or join.
      */
-    await halo.writeCredentialsMessage(createKeyAdmitMessage(this._keyring, identityKey.publicKey, identityKey));
+    await halo.credentialsWriter.write(createKeyAdmitMessage(this._keyring, identityKey.publicKey, identityKey));
 
     if (options.identityDisplayName) {
       // 4. Write the IdentityInfo message with descriptive details (eg, display name).
-      await halo.writeCredentialsMessage(createIdentityInfoMessage(this._keyring, options.identityDisplayName, identityKey));
+      await halo.credentialsWriter.write(createIdentityInfoMessage(this._keyring, options.identityDisplayName, identityKey));
     }
 
     if (options.deviceDisplayName) {
       // 5. Write the DeviceInfo message with descriptive details (eg, display name).
-      await halo.writeCredentialsMessage(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
+      await halo.credentialsWriter.write(createDeviceInfoMessage(this._keyring, options.deviceDisplayName, deviceKey));
     }
 
     // Create special properties item.

package/src/halo/halo-party.ts

@@ -5,10 +5,10 @@
 import assert from 'assert';
 
 import { Event, synchronized } from '@dxos/async';
-import { KeyHint, Message as HaloMessage } from '@dxos/credentials';
+import { KeyHint } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
-import { Timeframe, WriteReceipt } from '@dxos/echo-protocol';
+import { Timeframe } from '@dxos/echo-protocol';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
 
@@ -122,6 +122,10 @@ export class HaloParty {
     return this._partyCore.processor.feedKeys;
   }
 
+  get credentialsWriter () {
+    return this._partyCore.credentialsWriter;
+  }
+
   async getWriteFeedKey () {
     const feed = await this._feedProvider.createOrOpenWritableFeed();
     return feed.key;
@@ -146,6 +150,7 @@ export class HaloParty {
     this._invitationManager = new InvitationFactory(
       this._partyCore.processor,
       this._credentialsSigner,
+      this._partyCore.credentialsWriter,
       this._networkManager
     );
 
@@ -165,7 +170,11 @@ export class HaloParty {
     // Replication.
     await this._protocol.start([
       createReplicatorPlugin(this._feedProvider),
-      createAuthPlugin(createAuthenticator(this._partyCore.processor, this._credentialsSigner), peerId),
+      createAuthPlugin(createAuthenticator(
+        this._partyCore.processor,
+        this._credentialsSigner,
+        this._partyCore.credentialsWriter
+      ), peerId),
       createHaloRecoveryPlugin(this._credentialsSigner.getIdentityKey().publicKey, this._invitationManager, peerId)
     ]);
 
@@ -196,10 +205,6 @@ export class HaloParty {
     return this;
   }
 
-  writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
-    return this._partyCore.writeCredentialsMessage(message);
-  }
-
   async createInvitation (authenticationDetails: InvitationAuthenticator, options?: InvitationOptions): Promise<InvitationDescriptor> {
     assert(this._invitationManager, 'HALO party not open.');
     return this._invitationManager.createInvitation(authenticationDetails, options);

package/src/halo/halo.test.ts

@@ -26,10 +26,11 @@ describe('HALO', () => {
       .registerModel(ObjectModel);
 
     const networkManager = new NetworkManager();
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const storage = createStorage('', StorageType.RAM);
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
     const keyring = new Keyring();
-    const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
 
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(
       metadataStore,

package/src/invitations/greeting-responder.ts

@@ -14,12 +14,13 @@ import {
   KeyType,
   SecretProvider,
   SecretValidator
+  , Message as HaloMessage
 } from '@dxos/credentials';
 import { keyToString, randomBytes, PublicKey } from '@dxos/crypto';
-import { SwarmKey } from '@dxos/echo-protocol';
+import { FeedWriter, SwarmKey } from '@dxos/echo-protocol';
 import { FullyConnectedTopology, NetworkManager } from '@dxos/network-manager';
 
-import { CredentialWriter, PartyStateProvider } from '../pipeline';
+import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { InvitationOptions } from './common';
 import { greetingProtocolProvider } from './greeting-protocol-provider';
@@ -57,8 +58,9 @@ export class GreetingResponder {
 
   constructor (
     private readonly _networkManager: NetworkManager,
-    private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
-    private readonly _credentialsSigner: CredentialsSigner
+    private readonly _partyProcessor: PartyStateProvider,
+    private readonly _credentialsSigner: CredentialsSigner,
+    private readonly _credentialsWriter: FeedWriter<HaloMessage>
   ) {
     this._greeter = new Greeter(
       this._partyProcessor.partyKey,
@@ -222,7 +224,7 @@ export class GreetingResponder {
         [this._credentialsSigner.getDeviceSigningKeys()]
       );
 
-      await this._partyProcessor.writeHaloMessage(envelope);
+      await this._credentialsWriter.write(envelope);
 
       // Wait for keys to be admitted.
       await waitForCondition(() => admittedKeys.every(hasKey));

package/src/invitations/invitation-factory.ts

@@ -4,11 +4,12 @@
 
 import assert from 'assert';
 
-import { createPartyInvitationMessage } from '@dxos/credentials';
+import { createPartyInvitationMessage, Message as HaloMessage } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
+import { FeedWriter } from '@dxos/echo-protocol';
 import { NetworkManager } from '@dxos/network-manager';
 
-import { CredentialWriter, PartyStateProvider } from '../pipeline';
+import { PartyStateProvider } from '../pipeline';
 import { CredentialsSigner } from '../protocol/credentials-signer';
 import { defaultInvitationAuthenticator, InvitationAuthenticator, InvitationOptions } from './common';
 import { GreetingResponder } from './greeting-responder';
@@ -19,10 +20,11 @@ import { InvitationDescriptor, InvitationDescriptorType } from './invitation-des
  */
 export class InvitationFactory {
   constructor (
-    private readonly _partyProcessor: CredentialWriter & PartyStateProvider,
+    private readonly _partyProcessor: PartyStateProvider,
     // This needs to be a provider in case this is a backend for the HALO party.
     // Then the identity would be changed after this is instantiated.
     private readonly _credentialsSigner: CredentialsSigner,
+    private readonly _credentialsWriter: FeedWriter<HaloMessage>,
     private readonly _networkManager: NetworkManager
   ) {}
 
@@ -42,7 +44,7 @@ export class InvitationFactory {
       this._credentialsSigner.getDeviceSigningKeys()
     );
 
-    await this._partyProcessor.writeHaloMessage(invitationMessage);
+    await this._credentialsWriter.write(invitationMessage);
 
     return new InvitationDescriptor(
       InvitationDescriptorType.OFFLINE,
@@ -60,7 +62,8 @@ export class InvitationFactory {
     const responder = new GreetingResponder(
       this._networkManager,
       this._partyProcessor,
-      this._credentialsSigner
+      this._credentialsSigner,
+      this._credentialsWriter
     );
 
     const { secretValidator, secretProvider } = authenticationDetails;

package/src/parties/data-party.test.ts

@@ -23,9 +23,11 @@ import { DataParty } from './data-party';
 
 describe('DataParty', () => {
   const createParty = async (identity: IdentityCredentials, partyKey: PublicKey, hints: KeyHint[]) => {
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
-    const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+
+    const storage = createStorage('', StorageType.RAM);
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
     const networkManager = new NetworkManager();
     const partyFeedProvider = new PartyFeedProvider(metadataStore, identity.keyring, feedStore, partyKey);
@@ -60,7 +62,7 @@ describe('DataParty', () => {
     await party.open();
 
     const feed = await party.getWriteFeed();
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
@@ -80,14 +82,14 @@ describe('DataParty', () => {
     const party = await createParty(identity, partyKey.publicKey, []);
     await party.open();
     const feed = await party.getWriteFeed();
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
       partyKey
     ));
 
-    const authenticator = createAuthenticator(party.processor, identity.createCredentialsSigner());
+    const authenticator = createAuthenticator(party.processor, identity.createCredentialsSigner(), party.credentialsWriter);
     const credentialsProvider = createCredentialsProvider(identity.createCredentialsSigner(), party.key, feed.key);
 
     const wrappedCredentials = haloCodec.decode(credentialsProvider.get());
@@ -104,13 +106,13 @@ describe('DataParty', () => {
     const party = await createParty(identityA, partyKey.publicKey, []);
     await party.open();
     const feed = await party.getWriteFeed();
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
       partyKey
     ));
-    const authenticator = createAuthenticator(party.processor, identityA.createCredentialsSigner());
+    const authenticator = createAuthenticator(party.processor, identityA.createCredentialsSigner(), party.credentialsWriter);
 
     const identityB = await deriveTestDeviceCredentials(identityA);
     const credentialsProvider = createCredentialsProvider(identityB.createCredentialsSigner(), party.key, feed.key);
@@ -129,13 +131,13 @@ describe('DataParty', () => {
     const partyA = await createParty(identityA, partyKey.publicKey, []);
     await partyA.open();
     const feedA = await partyA.getWriteFeed();
-    await partyA.writeCredentialsMessage(createPartyGenesisMessage(
+    await partyA.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feedA.key,
       partyKey
     ));
-    await partyA.writeCredentialsMessage(createKeyAdmitMessage(
+    await partyA.credentialsWriter.write(createKeyAdmitMessage(
       keyring,
       partyKey.publicKey,
       identityA.identityKey,
@@ -165,13 +167,13 @@ describe('DataParty', () => {
     const partyA = await createParty(identityA, partyKeyA.publicKey, []);
     await partyA.open();
     const feedA = await partyA.getWriteFeed();
-    await partyA.writeCredentialsMessage(createPartyGenesisMessage(
+    await partyA.credentialsWriter.write(createPartyGenesisMessage(
       identityA.keyring,
       partyKeyA,
       feedA.key,
       partyKeyA
     ));
-    await partyA.writeCredentialsMessage(createKeyAdmitMessage(
+    await partyA.credentialsWriter.write(createKeyAdmitMessage(
       identityA.keyring,
       partyKeyA.publicKey,
       identityA.identityKey,

package/src/parties/data-party.ts

@@ -5,10 +5,10 @@
 import assert from 'assert';
 
 import { synchronized, Event } from '@dxos/async';
-import { KeyHint, Message as HaloMessage } from '@dxos/credentials';
+import { KeyHint } from '@dxos/credentials';
 import { PublicKey } from '@dxos/crypto';
 import { timed } from '@dxos/debug';
-import { PartyKey, PartySnapshot, Timeframe, WriteReceipt } from '@dxos/echo-protocol';
+import { PartyKey, PartySnapshot, Timeframe } from '@dxos/echo-protocol';
 import { FeedDescriptor } from '@dxos/feed-store';
 import { ModelFactory } from '@dxos/model-factory';
 import { NetworkManager } from '@dxos/network-manager';
@@ -127,6 +127,10 @@ export class DataParty {
     return this._invitationManager;
   }
 
+  get credentialsWriter () {
+    return this._partyCore.credentialsWriter;
+  }
+
   get title () {
     return this._preferences?.getLastKnownTitle();
   }
@@ -152,6 +156,7 @@ export class DataParty {
     this._invitationManager = new InvitationFactory(
       this._partyCore.processor,
       this._credentialsSigner,
+      this._partyCore.credentialsWriter,
       this._networkManager
     );
 
@@ -171,7 +176,7 @@ export class DataParty {
 
     await this._protocol.start([
       createReplicatorPlugin(this._feedProvider),
-      createAuthPlugin(createAuthenticator(this._partyCore.processor, this._credentialsSigner), deviceKey.publicKey),
+      createAuthPlugin(createAuthenticator(this._partyCore.processor, this._credentialsSigner, this.credentialsWriter), deviceKey.publicKey),
       createOfflineInvitationPlugin(this._invitationManager, deviceKey.publicKey)
     ]);
 
@@ -210,10 +215,6 @@ export class DataParty {
     return this._feedProvider.getFeeds();
   }
 
-  writeCredentialsMessage (message: HaloMessage): Promise<WriteReceipt> {
-    return this._partyCore.writeCredentialsMessage(message);
-  }
-
   get isActive (): boolean {
     assert(this._preferences, 'PartyActivator required');
     return this._preferences.isActive;

package/src/parties/party-factory.ts

@@ -63,7 +63,7 @@ export class PartyFactory {
     const writableFeed = await party.getWriteFeed();
 
     // PartyGenesis (self-signed by Party).
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       identity.keyring,
       partyKey,
       writableFeed.key,
@@ -71,7 +71,7 @@ export class PartyFactory {
     );
 
     // KeyAdmit (IdentityGenesis in an Envelope signed by Party).
-    await party.writeCredentialsMessage(createEnvelopeMessage(
+    await party.credentialsWriter.write(createEnvelopeMessage(
       identity.keyring,
       partyKey.publicKey,
       wrapMessage(identity.identityGenesis),
@@ -80,7 +80,7 @@ export class PartyFactory {
 
     // FeedAdmit (signed by the Device KeyChain).
     // TODO(dmaretskyi): Is this really needed since a feed is already admitted by party genesis message.
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       identity.keyring,
       partyKey.publicKey,
       writableFeed.key,
@@ -89,7 +89,7 @@ export class PartyFactory {
 
     // IdentityInfo in an Envelope signed by the Device KeyChain.
     if (identity.identityInfo) {
-      await party.writeCredentialsMessage(createEnvelopeMessage(
+      await party.credentialsWriter.write(createEnvelopeMessage(
         identity.keyring,
         partyKey.publicKey,
         wrapMessage(identity.identityInfo),
@@ -179,7 +179,7 @@ export class PartyFactory {
 
     // Copy our signed IdentityInfo into the new Party.
     if (identity.identityInfo) {
-      await party.writeCredentialsMessage(createEnvelopeMessage(
+      await party.credentialsWriter.write(createEnvelopeMessage(
         identity.keyring,
         partyKey,
         wrapMessage(identity.identityInfo),
@@ -204,7 +204,7 @@ export class PartyFactory {
     const writableFeed = await party.getWriteFeed();
 
     // PartyGenesis (self-signed by Party).
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       identity.keyring,
       partyKey,
       writableFeed.key,
@@ -212,7 +212,7 @@ export class PartyFactory {
     );
 
     // KeyAdmit (IdentityGenesis in an Envelope signed by Party).
-    await party.writeCredentialsMessage(createEnvelopeMessage(
+    await party.credentialsWriter.write(createEnvelopeMessage(
       identity.keyring,
       partyKey.publicKey,
       wrapMessage(identity.identityGenesis),
@@ -220,7 +220,7 @@ export class PartyFactory {
     ));
 
     // FeedAdmit (signed by the Device KeyChain).
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       identity.keyring,
       partyKey.publicKey,
       writableFeed.key,
@@ -229,7 +229,7 @@ export class PartyFactory {
 
     // IdentityInfo in an Envelope signed by the Device KeyChain.
     if (identity.identityInfo) {
-      await party.writeCredentialsMessage(createEnvelopeMessage(
+      await party.credentialsWriter.write(createEnvelopeMessage(
         identity.keyring,
         partyKey.publicKey,
         wrapMessage(identity.identityInfo),

package/src/parties/party-manager.test.ts

@@ -55,9 +55,11 @@ const log = debug('dxos:echo:parties:party-manager:test');
  */
 const setup = async () => {
   const keyring = new Keyring();
-  const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
-  const feedStore = new FeedStore(createStorage('feed', StorageType.RAM), { valueEncoding: codec });
-  const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+
+  const storage = createStorage('', StorageType.RAM);
+  const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+  const metadataStore = new MetadataStore(storage.directory('metadata'));
+  const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
   const modelFactory = new ModelFactory().registerModel(ObjectModel);
   const networkManager = new NetworkManager();
   const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
@@ -147,12 +149,13 @@ describe('Party manager', () => {
   });
 
   test('Create from cold start', async () => {
+
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     const keyring = new Keyring();
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
     const networkManager = new NetworkManager();
     const feedProviderFactory = (partyKey: PublicKey) => new PartyFeedProvider(metadataStore, keyring, feedStore, partyKey);
 

package/src/pipeline/metadata-store.test.ts

@@ -11,7 +11,8 @@ import { MetadataStore } from './metadata-store';
 
 describe('MetadataStore in-memory', () => {
   it('Creates party and adds feeds to it', async () => {
-    const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
     expect(store.parties?.length).toBe(0);
 
@@ -33,7 +34,8 @@ describe('MetadataStore in-memory', () => {
   });
 
   it('Creates party when adding feed', async () => {
-    const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
 
     const partyKey = PublicKey.random();
@@ -45,7 +47,8 @@ describe('MetadataStore in-memory', () => {
   });
 
   it('Doesn\'t add same feed twice', async () => {
-    const store = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const storage = createStorage('', StorageType.RAM);
+    const store = new MetadataStore(storage.directory('metadata'));
     await store.load();
 
     const partyKey = PublicKey.random();
@@ -60,7 +63,8 @@ describe('MetadataStore in-memory', () => {
 
   // TODO(yivlad): Doesn't work for now.
   it.skip('Resets storage', async () => {
-    const store = new MetadataStore(createStorage('snapshots', StorageType.RAM));
+    const storage = createStorage('snapshots', StorageType.RAM);
+    const store = new MetadataStore(storage.directory(''));
 
     const partyKey = PublicKey.random();
     const feedKey = PublicKey.random();

package/src/pipeline/metadata-store.ts

@@ -8,7 +8,7 @@ import debug from 'debug';
 import { PublicKey } from '@dxos/crypto';
 import { failUndefined } from '@dxos/debug';
 import { EchoMetadata, PartyMetadata, schema } from '@dxos/echo-protocol';
-import { Storage } from '@dxos/random-access-multi-storage';
+import { Directory } from '@dxos/random-access-multi-storage';
 
 /**
  * Version for the schema of the stored data as defined in dxos.echo.metadata.EchoMetadata.
@@ -28,7 +28,7 @@ export class MetadataStore {
   };
 
   constructor (
-    private readonly _storage: Storage
+    private readonly _directory: Directory
   ) {}
 
   get version (): number {
@@ -47,7 +47,7 @@ export class MetadataStore {
    * Loads metadata from persistent storage.
    */
   async load (): Promise<void> {
-    const file = this._storage.createOrOpen('EchoMetadata');
+    const file = this._directory.createOrOpen('EchoMetadata');
     try {
       const { size } = await file.stat();
       if (size === 0) {
@@ -75,7 +75,7 @@ export class MetadataStore {
       updated: new Date()
     };
 
-    const file = this._storage.createOrOpen('EchoMetadata');
+    const file = this._directory.createOrOpen('EchoMetadata');
 
     try {
       const encoded = Buffer.from(schema.getCodecForType('dxos.echo.metadata.EchoMetadata').encode(data));
@@ -90,7 +90,7 @@ export class MetadataStore {
    */
   async clear (): Promise<void> {
     log('Clearing all echo metadata...');
-    await this._storage.destroy();
+    await this._directory.destroy();
   }
 
   /**

package/src/pipeline/party-core.test.ts

@@ -24,15 +24,15 @@ import { PartyCore } from './party-core';
 describe('PartyCore', () => {
   const setup = async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
     const keyring = new Keyring();
 
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
 
@@ -51,7 +51,7 @@ describe('PartyCore', () => {
     afterTest(async () => party.close());
 
     // PartyGenesis (self-signed by Party).
-    await party.writeCredentialsMessage(createPartyGenesisMessage(
+    await party.credentialsWriter.write(createPartyGenesisMessage(
       keyring,
       partyKey,
       feed.key,
@@ -59,7 +59,7 @@ describe('PartyCore', () => {
     );
 
     // FeedAdmit (signed by the Device KeyChain).
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       partyKey.publicKey,
       feed.key,
@@ -120,7 +120,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
 
     const eventFired = feedStore.feedOpenedEvent.waitForCount(1);
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -132,15 +132,15 @@ describe('PartyCore', () => {
 
   test('opens feed from hints', async () => {
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
     const keyring = new Keyring();
 
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyKey = await keyring.createKeyRecord({ type: KeyType.PARTY });
 
@@ -197,7 +197,7 @@ describe('PartyCore', () => {
     const fullKey = keyring.getFullKey(feedKey.publicKey);
     const feed2 = await feedStore.openReadWriteFeed(fullKey!.publicKey, fullKey!.secretKey!);
 
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feed2.key,
@@ -226,7 +226,7 @@ describe('PartyCore', () => {
     const feedKey = await keyring.createKeyRecord({ type: KeyType.FEED });
     const fullKey = keyring.getFullKey(feedKey.publicKey);
 
-    await party.writeCredentialsMessage(createFeedAdmitMessage(
+    await party.credentialsWriter.write(createFeedAdmitMessage(
       keyring,
       party.key,
       feedKey.publicKey,
@@ -253,13 +253,13 @@ describe('PartyCore', () => {
     const peer1 = await setup();
 
     const storage = createStorage('', StorageType.RAM);
-    const feedStore = new FeedStore(storage, { valueEncoding: codec });
+    const feedStore = new FeedStore(storage.directory('feed'), { valueEncoding: codec });
     afterTest(async () => feedStore.close());
 
-    const metadataStore = new MetadataStore(createStorage('metadata', StorageType.RAM));
+    const metadataStore = new MetadataStore(storage.directory('metadata'));
 
     const modelFactory = new ModelFactory().registerModel(ObjectModel);
-    const snapshotStore = new SnapshotStore(createStorage('snapshots', StorageType.RAM));
+    const snapshotStore = new SnapshotStore(storage.directory('snapshots'));
 
     const partyFeedProvider = new PartyFeedProvider(metadataStore, peer1.keyring, feedStore, peer1.party.key);
 
@@ -273,7 +273,7 @@ describe('PartyCore', () => {
 
     const feed2 = await partyFeedProvider.createOrOpenWritableFeed();
 
-    await peer1.party.writeCredentialsMessage(createFeedAdmitMessage(
+    await peer1.party.credentialsWriter.write(createFeedAdmitMessage(
       peer1.keyring,
       peer1.party.key,
       feed2.key,