Merge pull request #731 from orbitdb/feat/new-ipfs-log

Use next ipfs-log
This commit is contained in:
shamb0t 2019-11-29 16:47:37 +00:00 committed by GitHub
commit a21907a0f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
122 changed files with 1083 additions and 670 deletions

1593
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,8 @@
"main": "src/OrbitDB.js",
"dependencies": {
"cids": "^0.7.1",
"ipfs-pubsub-1on1": "~0.0.4",
"ipfs-log": "orbitdb/ipfs-log",
"ipfs-pubsub-1on1": "~0.0.6",
"is-node": "^1.0.2",
"localstorage-down": "^0.6.7",
"logplease": "^1.2.14",
@ -25,13 +26,13 @@
"orbit-db-docstore": "~1.6.0",
"orbit-db-eventstore": "~1.6.0",
"orbit-db-feedstore": "~1.6.0",
"orbit-db-identity-provider": "~0.2.0",
"orbit-db-io": "^0.1.1",
"orbit-db-identity-provider": "orbitdb/orbit-db-identity-provider",
"orbit-db-io": "orbitdb/orbit-db-io",
"orbit-db-keystore": "~0.3.0",
"orbit-db-kvstore": "~1.6.0",
"orbit-db-pubsub": "~0.5.5",
"orbit-db-storage-adapter": "^0.5.3",
"orbit-db-store": "~2.7.0"
"orbit-db-store": "orbitdb/orbit-db-store"
},
"devDependencies": {
"babel-cli": "^6.26.0",
@ -76,7 +77,7 @@
"lint:docs": "remark -qf -u validate-links .",
"test:all": "npm run test:browser-multiple-tabs && npm run test",
"test": "cross-env TEST=all mocha",
"test:browser-multiple-tabs": "npm run build:dist && cpy dist/orbitdb.min.js ./test/browser/orbitdb.js && cpy node_modules/ipfs/dist/index.js ./test/browser/ipfs.js && cpy node_modules/orbit-db-identity-provider/dist/index-browser.min.js ./test/browser/identities.js && cpy node_modules/ipfs-log/dist/ipfslog.min.js ./test/browser/ipfslog.min.js && mocha ./test/browser/concurrent.spec.js",
"test:browser-multiple-tabs": "npm run build:dist && cpy dist/orbitdb.min.js ./test/browser --rename=orbitdb.js && cpy node_modules/ipfs/dist/index.js ./test/browser --rename=ipfs.js && cpy node_modules/orbit-db-identity-provider/dist/index-browser.min.js ./test/browser --rename=identities.js && cpy node_modules/ipfs-log/dist/ipfslog.min.js ./test/browser && mocha ./test/browser/concurrent.spec.js",
"build": "npm run build:es5 && npm run build:debug && npm run build:dist && npm run build:examples && npm run build:docs/toc",
"build:examples": "webpack --config conf/webpack.example.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy node_modules/ipfs/dist/index.js examples/browser/lib/ipfs.js",
"build:dist": "webpack --config conf/webpack.config.js --sort-modules-by size && mkdirp examples/browser/lib && cpy dist/orbitdb.min.js examples/browser/lib/orbitdb.min.js",

View File

@ -3,10 +3,10 @@
<title>Break OrbitDB</title>
<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
<meta content="utf-8" http-equiv="encoding">
<script type="text/javascript" src="orbitdb.js/orbitdb.min.js" charset="utf-8"></script>
<script type="text/javascript" src="ipfs.js/index.js" charset="utf-8"></script>
<script type="text/javascript" src="identities.js/index-browser.min.js" charset="utf-8"></script>
<script type="text/javascript" src="ipfslog.min.js/ipfslog.min.js" charset="utf-8"></script>
<script type="text/javascript" src="orbitdb.js" charset="utf-8"></script>
<script type="text/javascript" src="ipfs.js" charset="utf-8"></script>
<script type="text/javascript" src="identities.js" charset="utf-8"></script>
<script type="text/javascript" src="ipfslog.min.js" charset="utf-8"></script>
</head>
<body>
<div style="padding: 0px 0px 25px 0px;">

View File

@ -153,7 +153,7 @@ Object.keys(testAPIs).forEach(API => {
it('loads cache from previous version of orbit-db', async () => {
const dbName = 'cache-schema-test'
db = await orbitdb.create(dbName, 'keyvalue')
db = await orbitdb.create(dbName, 'keyvalue', { overwrite: true })
const manifestHash = db.address.root
const migrationDataPath = path.join(dbPath, manifestHash, dbName)

View File

@ -161,7 +161,8 @@ Object.keys(testAPIs).forEach(API => {
assert.deepEqual(res.payload, expectedOperation)
assert.notEqual(res.next, undefined)
assert.equal(res.next.length, 1)
assert.equal(res.v, 1)
assert.equal(res.refs.length, 0)
assert.equal(res.v, 2)
assert.notEqual(res.clock, undefined)
assert.equal(res.clock.time, 2)
assert.notEqual(res.key, undefined)

View File

@ -1,5 +1,5 @@
<EFBFBD> <12>
<EFBFBD> <12>
IPFS -- Inter-Planetary File system
IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas

View File

@ -0,0 +1 @@
¢dtypedipfsfparams¡gaddressx1zdpuAts3TrKq8itLR1uSZPVfmiRbF8wGxJ6ioCb33EoDHd4Pi

View File

@ -0,0 +1,3 @@
Ąewritei[
"*"
]

View File

@ -0,0 +1 @@
£dnamejv1-entriesdtypedfeedpaccessControllerx7/ipfs/zdpuAsYRtJLLLDibnmxWPzyRGJEqtjmJP27ppKWcLreNGGTFN

Some files were not shown because too many files have changed in this diff Show More