storage-node: renaming packages

storage-node/packages/cli/README.md

@@ -1,5 +1,5 @@
 # A CLI for the Joystream Runtime & Colossus
 
-- CLI access for some functionality from `@joystream/runtime-api`
+- CLI access for some functionality from `@joystream/storage-runtime-api`
 - Colossus/storage node functionality:
   - File uploads

storage-node/packages/cli/bin/cli.js

@@ -21,7 +21,7 @@
 
 const fs = require('fs')
 const assert = require('assert')
-const { RuntimeApi } = require('@joystream/runtime-api')
+const { RuntimeApi } = require('@joystream/storage-runtime-api')
 const meow = require('meow')
 const chalk = require('chalk')
 const _ = require('lodash')

storage-node/packages/cli/package.json

@@ -39,7 +39,7 @@
     "temp": "^0.9.0"
   },
   "dependencies": {
-    "@joystream/runtime-api": "^0.1.0",
+    "@joystream/storage-runtime-api": "^0.1.0",
     "chalk": "^2.4.2",
     "lodash": "^4.17.11",
     "meow": "^5.0.0",

storage-node/packages/colossus/bin/cli.js

@@ -117,7 +117,7 @@ function start_discovery_service ({ api, port }) {
 function get_storage (runtime_api) {
   // TODO at some point, we can figure out what backend-specific connection
   // options make sense. For now, just don't use any configuration.
-  const { Storage } = require('@joystream/storage')
+  const { Storage } = require('@joystream/storage-node-backend')
 
   const options = {
     resolve_content_id: async (content_id) => {
@@ -136,7 +136,7 @@ function get_storage (runtime_api) {
 
 async function init_api_production ({ wsProvider, providerId, keyFile, passphrase }) {
   // Load key information
-  const { RuntimeApi } = require('@joystream/runtime-api')
+  const { RuntimeApi } = require('@joystream/storage-runtime-api')
 
   if (!keyFile) {
     throw new Error('Must specify a --key-file argument for running a storage node.')
@@ -166,7 +166,7 @@ async function init_api_production ({ wsProvider, providerId, keyFile, passphras
 
 async function init_api_development () {
   // Load key information
-  const { RuntimeApi } = require('@joystream/runtime-api')
+  const { RuntimeApi } = require('@joystream/storage-runtime-api')
 
   const wsProvider = 'ws://localhost:9944'
 
@@ -204,7 +204,7 @@ async function announce_public_url (api, publicUrl) {
   }
 
   debug('announcing public url')
-  const { publish } = require('@joystream/discovery')
+  const { publish } = require('@joystream/service-discovery')
 
   try {
     const serviceInformation = get_service_information(publicUrl)
@@ -269,7 +269,7 @@ const commands = {
   },
   'discovery': async () => {
     debug('Starting Joystream Discovery Service')
-    const { RuntimeApi } = require('@joystream/runtime-api')
+    const { RuntimeApi } = require('@joystream/storage-runtime-api')
     const wsProvider = cli.flags.wsProvider
     const api = await RuntimeApi.create({ provider_url: wsProvider })
     const port = cli.flags.port

storage-node/packages/colossus/lib/app.js

@@ -32,8 +32,8 @@ const yaml = require('js-yaml');
 // Project requires
 const validateResponses = require('./middleware/validate_responses');
 const fileUploads = require('./middleware/file_uploads');
-const pagination = require('@joystream/util/pagination');
-const storage = require('@joystream/storage');
+const pagination = require('@joystream/storage-utils/pagination');
+const storage = require('@joystream/storage-node-backend');
 
 // Configure app
 function create_app(project_root, storage, runtime)

storage-node/packages/colossus/package.json

@@ -49,9 +49,9 @@
     "temp": "^0.9.0"
   },
   "dependencies": {
-    "@joystream/runtime-api": "^0.1.0",
-    "@joystream/storage": "^0.1.0",
-    "@joystream/util": "^0.1.0",
+    "@joystream/storage-runtime-api": "^0.1.0",
+    "@joystream/storage-node-backend": "^0.1.0",
+    "@joystream/storage-utils": "^0.1.0",
     "body-parser": "^1.19.0",
     "chalk": "^2.4.2",
     "cors": "^2.8.5",

storage-node/packages/colossus/paths/asset/v0/{id}.js

@@ -25,7 +25,7 @@ const mime_types = require('mime-types');
 
 const debug = require('debug')('joystream:colossus:api:asset');
 
-const util_ranges = require('@joystream/util/ranges');
+const util_ranges = require('@joystream/storage-utils/ranges');
 const filter = require('@joystream/storage/filter');
 
 function error_handler(response, err, code)

storage-node/packages/colossus/paths/discover/v0/{id}.js

@@ -1,4 +1,4 @@
-const { discover } = require('@joystream/discovery')
+const { discover } = require('@joystream/service-discovery')
 const debug = require('debug')('joystream:colossus:api:discovery');
 
 const MAX_CACHE_AGE = 30 * 60 * 1000;

storage-node/packages/discovery/README.md

@@ -1,6 +1,6 @@
 # Discovery
 
-The `@joystream/discovery` package provides an API for role services to publish
+The `@joystream/service-discovery` package provides an API for role services to publish
 discovery information about themselves, and for consumers to resolve this
 information.
 

storage-node/packages/discovery/discover.js

@@ -1,10 +1,10 @@
 const axios = require('axios')
 const debug = require('debug')('joystream:discovery:discover')
-const stripEndingSlash = require('@joystream/util/stripEndingSlash')
+const stripEndingSlash = require('@joystream/storage-utils/stripEndingSlash')
 
 const ipfs = require('ipfs-http-client')('localhost', '5001', { protocol: 'http' })
 const BN = require('bn.js')
-const { newExternallyControlledPromise } = require('@joystream/util/externalPromise')
+const { newExternallyControlledPromise } = require('@joystream/storage-utils/externalPromise')
 
 /**
  * Determines if code is running in a browser by testing for the global window object

storage-node/packages/discovery/example.js

@@ -1,4 +1,4 @@
-const { RuntimeApi } = require('@joystream/runtime-api')
+const { RuntimeApi } = require('@joystream/storage-runtime-api')
 
 const { discover, publish } = require('./')
 

storage-node/packages/discovery/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@joystream/discovery",
+  "name": "@joystream/service-discovery",
   "version": "0.1.0",
   "description": "Service Discovery - Joystream Storage Node",
   "author": "Joystream",
@@ -43,8 +43,8 @@
     "temp": "^0.9.0"
   },
   "dependencies": {
-    "@joystream/runtime-api": "^0.1.0",
-    "@joystream/util": "^0.1.0",
+    "@joystream/storage-runtime-api": "^0.1.0",
+    "@joystream/storage-utils": "^0.1.0",
     "async-lock": "^1.2.0",
     "axios": "^0.18.0",
     "chalk": "^2.4.2",

storage-node/packages/helios/bin/cli.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
-const { RuntimeApi } = require('@joystream/runtime-api')
+const { RuntimeApi } = require('@joystream/storage-runtime-api')
 const { encodeAddress } = require('@polkadot/keyring')
-const { discover } = require('@joystream/discovery')
+const { discover } = require('@joystream/service-discovery')
 const axios = require('axios')
-const stripEndingSlash = require('@joystream/util/stripEndingSlash')
+const stripEndingSlash = require('@joystream/storage-utils/stripEndingSlash')
 
 async function main () {
   const runtime = await RuntimeApi.create()

storage-node/packages/helios/package.json

@@ -9,7 +9,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@joystream/runtime-api": "^0.1.0",
+    "@joystream/storage-runtime-api": "^0.1.0",
     "@types/bn.js": "^4.11.5",
     "axios": "^0.19.0",
     "bn.js": "^4.11.8"

storage-node/packages/runtime-api/balances.js

@@ -20,7 +20,7 @@
 
 const debug = require('debug')('joystream:runtime:balances');
 
-const { IdentitiesApi } = require('@joystream/runtime-api/identities');
+const { IdentitiesApi } = require('@joystream/storage-runtime-api/identities');
 
 /*
  * Bundle API calls related to account balances.

storage-node/packages/runtime-api/index.js

@@ -23,13 +23,13 @@ const debug = require('debug')('joystream:runtime:base')
 const { registerJoystreamTypes } = require('@joystream/types')
 const { ApiPromise, WsProvider } = require('@polkadot/api')
 
-const { IdentitiesApi } = require('@joystream/runtime-api/identities')
-const { BalancesApi } = require('@joystream/runtime-api/balances')
-const { WorkersApi } = require('@joystream/runtime-api/workers')
-const { AssetsApi } = require('@joystream/runtime-api/assets')
-const { DiscoveryApi } = require('@joystream/runtime-api/discovery')
+const { IdentitiesApi } = require('@joystream/storage-runtime-api/identities')
+const { BalancesApi } = require('@joystream/storage-runtime-api/balances')
+const { WorkersApi } = require('@joystream/storage-runtime-api/workers')
+const { AssetsApi } = require('@joystream/storage-runtime-api/assets')
+const { DiscoveryApi } = require('@joystream/storage-runtime-api/discovery')
 const AsyncLock = require('async-lock')
-const { newExternallyControlledPromise } = require('@joystream/util/externalPromise')
+const { newExternallyControlledPromise } = require('@joystream/storage-utils/externalPromise')
 
 /*
  * Initialize runtime (substrate) API and keyring.

storage-node/packages/runtime-api/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@joystream/runtime-api",
+  "name": "@joystream/storage-runtime-api",
   "version": "0.1.0",
   "description": "Runtime API abstraction for Joystream Storage Node",
   "author": "Joystream",

storage-node/packages/runtime-api/test/assets.js

@@ -22,7 +22,7 @@ const mocha = require('mocha');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 
-const { RuntimeApi } = require('@joystream/runtime-api');
+const { RuntimeApi } = require('@joystream/storage-runtime-api');
 
 describe('Assets', () => {
   var api;

storage-node/packages/runtime-api/test/balances.js

@@ -22,7 +22,7 @@ const mocha = require('mocha');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 
-const { RuntimeApi } = require('@joystream/runtime-api');
+const { RuntimeApi } = require('@joystream/storage-runtime-api');
 
 describe('Balances', () => {
   var api;

storage-node/packages/runtime-api/test/identities.js

@@ -23,7 +23,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const temp = require('temp').track();
 
-const { RuntimeApi } = require('@joystream/runtime-api');
+const { RuntimeApi } = require('@joystream/storage-runtime-api');
 
 describe('Identities', () => {
   var api;

storage-node/packages/runtime-api/test/index.js

@@ -21,7 +21,7 @@
 const mocha = require('mocha');
 const expect = require('chai').expect;
 
-const { RuntimeApi } = require('@joystream/runtime-api');
+const { RuntimeApi } = require('@joystream/storage-runtime-api');
 
 describe('RuntimeApi', () => {
   it('can be created', async () => {

storage-node/packages/storage/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@joystream/storage",
+  "name": "@joystream/storage-node-backend",
   "version": "0.1.0",
   "description": "Storage management code for Joystream Storage Node",
   "author": "Joystream",

storage-node/packages/storage/test/storage.js

@@ -26,7 +26,7 @@ const expect = chai.expect;
 
 const fs = require('fs');
 
-const { Storage } = require('@joystream/storage');
+const { Storage } = require('@joystream/storage-node-backend');
 
 const IPFS_CID_REGEX = /^Qm[1-9A-HJ-NP-Za-km-z]{44}$/;
 

storage-node/packages/util/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@joystream/util",
+  "name": "@joystream/storage-utils",
   "version": "0.1.0",
   "description": "Utility code for Joystream Storage Node",
   "author": "Joystream",

storage-node/packages/util/test/fs/resolve.js

@@ -22,7 +22,7 @@ const mocha = require('mocha');
 const expect = require('chai').expect;
 const path = require('path');
 
-const resolve = require('@joystream/util/fs/resolve');
+const resolve = require('@joystream/storage-utils/fs/resolve');
 
 function tests(base)
 {

storage-node/packages/util/test/fs/walk.js

@@ -25,7 +25,7 @@ const temp = require('temp').track();
 const fs = require('fs');
 const path = require('path');
 
-const fswalk = require('@joystream/util/fs/walk');
+const fswalk = require('@joystream/storage-utils/fs/walk');
 
 function walktest(archive, base, done)
 {

storage-node/packages/util/test/lru.js

@@ -21,7 +21,7 @@
 const mocha = require('mocha');
 const expect = require('chai').expect;
 
-const lru = require('@joystream/util/lru');
+const lru = require('@joystream/storage-utils/lru');
 
 const DEFAULT_SLEEP = 1;
 function sleep(ms = DEFAULT_SLEEP)

storage-node/packages/util/test/pagination.js

@@ -22,7 +22,7 @@ const mocha = require('mocha');
 const expect = require('chai').expect;
 const mock_http = require('node-mocks-http');
 
-const pagination = require('@joystream/util/pagination');
+const pagination = require('@joystream/storage-utils/pagination');
 
 describe('util/pagination', function()
 {

storage-node/packages/util/test/ranges.js

@@ -23,7 +23,7 @@ const expect = require('chai').expect;
 const mock_http = require('node-mocks-http');
 const stream_buffers = require('stream-buffers');
 
-const ranges = require('@joystream/util/ranges');
+const ranges = require('@joystream/storage-utils/ranges');
 
 describe('util/ranges', function()
 {