Merge pull request #5 from orbitdb/refactor/oplog-reorg

refactor: oplog reorg
This commit is contained in:
Haad
2023-02-16 13:12:57 +02:00
committed by GitHub
24 changed files with 28 additions and 34 deletions

View File

@@ -1,3 +1,2 @@
export { default as Log, DefaultAccessController } from './log.js'
export { default as Entry } from './entry.js'
export { Log, DefaultAccessController, Entry } from './oplog/index.js'
export { default as KeyStore } from './key-store.js'

View File

@@ -1,9 +1,9 @@
import Clock from './lamport-clock.js'
import { isDefined } from './utils/index.js'
import * as Block from 'multiformats/block'
import * as dagCbor from '@ipld/dag-cbor'
import { sha256 } from 'multiformats/hashes/sha2'
import { base58btc } from 'multiformats/bases/base58'
import { isDefined } from '../utils/index.js'
/*
* @description

View File

@@ -1,5 +1,5 @@
import Entry from './entry.js'
import MemoryStorage from './storage/memory.js'
import MemoryStorage from '../storage/memory.js'
const DefaultStorage = MemoryStorage

4
src/oplog/index.js Normal file
View File

@@ -0,0 +1,4 @@
export { default as Log, DefaultAccessController } from './log.js'
export { default as Entry } from './entry.js'
export { default as Clock } from './lamport-clock.js'
export { default as Sorting } from './sorting.js'

View File

@@ -2,13 +2,13 @@ import LRU from 'lru'
import Entry from './entry.js'
import Clock from './lamport-clock.js'
import Heads from './heads.js'
import Sorting from './sorting/log.js'
import MemoryStorage from './storage/memory.js'
import Sorting from './sorting.js'
import MemoryStorage from '../storage/memory.js'
// import LRUStorage from './storage/lru.js'
// import LevelStorage from './storage/level.js'
// import IPFSBlockStorage from './storage/ipfs-block.js'
// import ComposedStorage from './storage/composed.js'
import { isDefined } from './utils/index.js'
import { isDefined } from '../utils/index.js'
const { LastWriteWins, NoZeroes } = Sorting

View File

@@ -1,4 +1,4 @@
import Clock from '../lamport-clock.js'
import Clock from './lamport-clock.js'
/**
* Sort two entries as Last-Write-Wins (LWW).

View File

@@ -1 +0,0 @@
export { LogSorting } from './src/log.js'

View File

@@ -1,7 +1,6 @@
import { deepStrictEqual, strictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../src/log.js'
import Entry from '../src/entry.js'
import { Log, Entry } from '../src/oplog/index.js'
import IdentityProvider from '../src/identities/index.js'
import KeyStore from '../src/key-store.js'
import { DocumentStore, Database } from '../src/db/index.js'

View File

@@ -1,7 +1,6 @@
import { deepStrictEqual, strictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../src/log.js'
import Entry from '../src/entry.js'
import { Log, Entry } from '../src/oplog/index.js'
import IdentityProvider from '../src/identities/index.js'
import KeyStore from '../src/key-store.js'
import { EventStore, Database } from '../src/db/index.js'

View File

@@ -1,7 +1,6 @@
import { deepStrictEqual, strictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../src/log.js'
import Entry from '../src/entry.js'
import { Log, Entry } from '../src/oplog/index.js'
import IdentityProvider from '../src/identities/index.js'
import KeyStore from '../src/key-store.js'
import { Feed, Database } from '../src/db/index.js'

View File

@@ -1,7 +1,6 @@
import { deepStrictEqual, strictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../src/log.js'
import Entry from '../src/entry.js'
import { Log, Entry } from '../src/oplog/index.js'
import IdentityProvider from '../src/identities/index.js'
import KeyStore from '../src/key-store.js'
import { KeyValue, KeyValuePersisted, Database } from '../src/db/index.js'

View File

@@ -1,7 +1,7 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import MemoryStorage from '../../src/storage/memory.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'

View File

@@ -1,7 +1,7 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import MemoryStorage from '../../src/storage/memory.js'

View File

@@ -1,7 +1,7 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Entry from '../../src/entry.js'
import { Entry } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import { config, testAPIs, startIpfs, stopIpfs } from 'orbit-db-test-utils'

View File

@@ -1,7 +1,7 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import MemoryStorage from '../../src/storage/memory.js'

View File

@@ -1,6 +1,6 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import LogCreator from './utils/log-creator.js'

View File

@@ -1,7 +1,7 @@
import { strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import MemoryStorage from '../../src/storage/memory.js'

View File

@@ -1,7 +1,6 @@
import { strictEqual, notStrictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import Clock from '../../src/lamport-clock.js'
import Log from '../../src/log.js'
import { Log, Clock } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import MemoryStorage from '../../src/storage/memory.js'

View File

@@ -1,10 +1,8 @@
import { strictEqual, deepStrictEqual, notStrictEqual, throws } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Sorting from '../../src/sorting/log.js'
import { Log, Entry, Sorting } from '../../src/oplog/index.js'
import bigLogString from '../fixtures/big-log.fixture.js'
import Entry from '../../src/entry.js'
import Log from '../../src/log.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import LogCreator from './utils/log-creator.js'

View File

@@ -1,7 +1,6 @@
import { notStrictEqual, deepStrictEqual, strictEqual } from 'assert'
import rimraf from 'rimraf'
import Entry from '../../src/entry.js'
import Log from '../../src/log.js'
import { Log, Entry } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import { copy } from 'fs-extra'

View File

@@ -1,7 +1,7 @@
import { strictEqual } from 'assert'
import rimraf from 'rimraf'
import { copy } from 'fs-extra'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'
import MemoryStorage from '../../src/storage/memory.js'

View File

@@ -1,6 +1,6 @@
import { notStrictEqual, strictEqual, deepStrictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../../src/log.js'
import { Log } from '../../src/oplog/index.js'
import IdentityProvider from '../../src/identities/index.js'
import KeyStore from '../../src/key-store.js'

View File

@@ -1,10 +1,10 @@
import * as IPFS from 'ipfs'
import { strictEqual, notStrictEqual } from 'assert'
import rimraf from 'rimraf'
import Log from '../src/log.js'
import { IPFSBlockStorage, MemoryStorage, LRUStorage, ComposedStorage } from '../src/storage/index.js'
import { Log } from '../src/oplog/index.js'
import IdentityProvider from '../src/identities/index.js'
import KeyStore from '../src/key-store.js'
import { IPFSBlockStorage, MemoryStorage, LRUStorage, ComposedStorage } from '../src/storage/index.js'
import { copy } from 'fs-extra'
// Test utils