From f04c0303b8f7768e2216c0fd9d82c6829c0d85db Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 5 Nov 2019 14:29:51 -0500 Subject: [PATCH] Revert "maint: support 0.44 SDK" This reverts commit 8a1ebd33a71f8166d26f80b87a0ad089f9bc8cdb. --- package.json | 6 +++--- src/platforms/electron/unpackByOutpoint.js | 2 +- src/ui/redux/actions/content.js | 6 +----- static/app-strings.json | 6 +----- yarn.lock | 8 ++++---- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 78e2c779c..045fcb2d5 100644 --- a/package.json +++ b/package.json @@ -127,8 +127,8 @@ "husky": "^0.14.3", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#03d53fb4ddadc8dc469670cf75a624d0bca354f2", - "lbryinc": "lbryio/lbryinc#896fafccef1ecc711d3ca7f1e8088cc87d38b45d", + "lbry-redux": "lbryio/lbry-redux#861880a029a748bb4300bec9b16b7136ac51c5c3", + "lbryinc": "lbryio/lbryinc#f962cdf31a4c36f7bdb8b71fc403a3377d58a460", "lint-staged": "^7.0.2", "localforage": "^1.7.1", "lodash-es": "^4.17.14", @@ -203,7 +203,7 @@ "yarn": "^1.3" }, "lbrySettings": { - "lbrynetDaemonVersion": "0.45.0", + "lbrynetDaemonVersion": "0.43.3", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip", "lbrynetDaemonDir": "static/daemon", "lbrynetDaemonFileName": "lbrynet" diff --git a/src/platforms/electron/unpackByOutpoint.js b/src/platforms/electron/unpackByOutpoint.js index 5534d2890..3c2d42e5b 100644 --- a/src/platforms/electron/unpackByOutpoint.js +++ b/src/platforms/electron/unpackByOutpoint.js @@ -3,7 +3,7 @@ import path from 'path'; import { unpackDirectory } from 'lbry-format'; async function unpackByOutpoint(lbry, outpoint) { - const { items: claimFiles } = await lbry.file_list({ outpoint, full_status: true, page: 1, page_size: 1 }); + const claimFiles = await lbry.file_list({ outpoint, full_status: true }); if (claimFiles && claimFiles.length) { const claimFileInfo = claimFiles[0]; diff --git a/src/ui/redux/actions/content.js b/src/ui/redux/actions/content.js index e50d7f9ca..7d4eb842b 100644 --- a/src/ui/redux/actions/content.js +++ b/src/ui/redux/actions/content.js @@ -48,11 +48,7 @@ export function doUpdateLoadStatus(uri: string, outpoint: string) { Lbry.file_list({ outpoint, full_status: true, - page: 1, - page_size: 1, - }).then(result => { - const { items: fileInfos } = result; - const fileInfo = fileInfos[0]; + }).then(([fileInfo]) => { if (!fileInfo || fileInfo.written_bytes === 0) { // download hasn't started yet setNextStatusUpdate(); diff --git a/static/app-strings.json b/static/app-strings.json index 6b9f233c2..f2404966a 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -857,9 +857,5 @@ "Your %publishMessage% pending on LBRY. It will take a few minutes to appear for other users.": "Your %publishMessage% pending on LBRY. It will take a few minutes to appear for other users.", "Upload will continue in the background, please do not shut down immediately. Leaving the app running helps the network, thank you!": "Upload will continue in the background, please do not shut down immediately. Leaving the app running helps the network, thank you!", "Are you sure want to revoke this claim?": "Are you sure want to revoke this claim?", - "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.": "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.", - "No results for %query%": "No results for %query%", - "You haven't downloaded anything from LBRY yet.": "You haven't downloaded anything from LBRY yet.", - "Explore new content": "Explore new content", - "Use this address to receive LBC.": "Use this address to receive LBC." + "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee.": "This will prevent others from resolving and accessing the content you published. It will return the LBC to your spendable balance, less a small transaction fee." } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 3f571ac91..e5bf5ae2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6843,17 +6843,17 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#ec2b44d053326fb0476facb4ab70c29e42eb7286: +lbry-redux@lbryio/lbry-redux#861880a029a748bb4300bec9b16b7136ac51c5c3: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/ec2b44d053326fb0476facb4ab70c29e42eb7286" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/861880a029a748bb4300bec9b16b7136ac51c5c3" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" uuid "^3.3.2" -lbryinc@lbryio/lbryinc#896fafccef1ecc711d3ca7f1e8088cc87d38b45d: +lbryinc@lbryio/lbryinc#f962cdf31a4c36f7bdb8b71fc403a3377d58a460: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/896fafccef1ecc711d3ca7f1e8088cc87d38b45d" + resolved "https://codeload.github.com/lbryio/lbryinc/tar.gz/f962cdf31a4c36f7bdb8b71fc403a3377d58a460" dependencies: reselect "^3.0.0"