From ca279584a7918f54e67b9f47e7c6c9ddaee953dd Mon Sep 17 00:00:00 2001 From: Julien Heller Date: Fri, 17 Aug 2018 12:44:14 -0400 Subject: [PATCH] Update to support demux-js 1.0.2 --- package.json | 4 ++-- src/MassiveActionHandler.ts | 6 ++---- src/testHelpers/JsonActionReader.ts | 15 +++++++-------- src/testHelpers/blockchain.json | 24 +++++++++++++++--------- yarn.lock | 13 ++++--------- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index ec29427..51c5027 100644 --- a/package.json +++ b/package.json @@ -30,14 +30,14 @@ "typescript": "^2.9.2" }, "dependencies": { - "demux-js": "0.0.1-docs", + "demux-js": "^1.0.2", "massive": "^5.2.0", "pg-promise": "^8.4.5", "request": "^2.87.0", "request-promise-native": "^1.0.5" }, "peerDependencies": { - "demux-js": "0.0.1-docs" + "demux-js": "^1.0.2" }, "scripts": { "release": "release-it", diff --git a/src/MassiveActionHandler.ts b/src/MassiveActionHandler.ts index 539995d..7fad9ca 100644 --- a/src/MassiveActionHandler.ts +++ b/src/MassiveActionHandler.ts @@ -1,6 +1,4 @@ -import { Block, Effect, handlers, IndexState, Updater } from "demux-js" - -export const { AbstractActionHandler } = handlers +import { AbstractActionHandler, Block, Effect, IndexState, Updater } from "demux-js" /** * Connects to a Postgres database using [MassiveJS](https://github.com/dmfay/massive-js). This expects that @@ -39,7 +37,7 @@ export class MassiveActionHandler extends AbstractActionHandler { } protected async updateIndexState(state: any, block: Block, isReplay: boolean) { - const { actions, ...blockInfo } = block + const { blockInfo } = block state._index_state.save({ id: 0, block_number: blockInfo.blockNumber, diff --git a/src/testHelpers/JsonActionReader.ts b/src/testHelpers/JsonActionReader.ts index 6ce9fb8..35e881a 100644 --- a/src/testHelpers/JsonActionReader.ts +++ b/src/testHelpers/JsonActionReader.ts @@ -1,8 +1,6 @@ -import { Block, readers } from "demux-js" +import { AbstractActionReader, Block } from "demux-js" import request from "request-promise-native" -export const { AbstractActionReader } = readers - /** * Reads from an array of `Block` objects, useful for testing. */ @@ -19,10 +17,11 @@ export class JsonActionReader extends AbstractActionReader { public async getHeadBlockNumber(): Promise { const block = this.blockchain.slice(-1)[0] - if (this.blockchain.length !== block.blockNumber) { - throw Error(`Block at position ${this.blockchain.length} indicates position ${block.blockNumber} incorrectly.`) + const { blockInfo: { blockNumber } } = block + if (this.blockchain.length !== blockNumber) { + throw Error(`Block at position ${this.blockchain.length} indicates position ${blockNumber} incorrectly.`) } - return block.blockNumber + return blockNumber } public async getBlock(blockNumber: number): Promise { @@ -30,8 +29,8 @@ export class JsonActionReader extends AbstractActionReader { if (!block) { throw Error(`Block at position ${blockNumber} does not exist.`) } - if (block.blockNumber !== blockNumber) { - throw Error(`Block at position ${blockNumber} indicates position ${block.blockNumber} incorrectly.`) + if (block.blockInfo.blockNumber !== blockNumber) { + throw Error(`Block at position ${blockNumber} indicates position ${block.blockInfo.blockNumber} incorrectly.`) } return block } diff --git a/src/testHelpers/blockchain.json b/src/testHelpers/blockchain.json index 4c9fb76..3246ed6 100644 --- a/src/testHelpers/blockchain.json +++ b/src/testHelpers/blockchain.json @@ -1,8 +1,10 @@ [ { - "blockNumber": 1, - "blockHash": "0000000000000000000000000000000000000000000000000000000000000000", - "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000000", + "blockInfo": { + "blockNumber": 1, + "blockHash": "0000000000000000000000000000000000000000000000000000000000000000", + "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000000" + }, "actions": [ { "type": "add_todo", @@ -21,9 +23,11 @@ ] }, { - "blockNumber": 2, - "blockHash": "0000000000000000000000000000000000000000000000000000000000000001", - "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000000", + "blockInfo": { + "blockNumber": 2, + "blockHash": "0000000000000000000000000000000000000000000000000000000000000001", + "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000000" + }, "actions": [ { "type": "add_tasks", @@ -53,9 +57,11 @@ ] }, { - "blockNumber": 3, - "blockHash": "0000000000000000000000000000000000000000000000000000000000000002", - "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000001", + "blockInfo": { + "blockNumber": 3, + "blockHash": "0000000000000000000000000000000000000000000000000000000000000002", + "previousBlockHash": "0000000000000000000000000000000000000000000000000000000000000001" + }, "actions": [ { "type": "update_task", diff --git a/yarn.lock b/yarn.lock index 917804d..db03e73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1629,14 +1629,9 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" -demux-js@0.0.1-docs: - version "0.0.1-docs" - resolved "https://registry.yarnpkg.com/demux-js/-/demux-js-0.0.1-docs.tgz#5ce14f04c146326f8ab222ff2c30e9796c560948" - dependencies: - massive "^5.1.3" - pg-promise "^8.4.5" - request "^2.87.0" - request-promise-native "^1.0.5" +demux-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/demux-js/-/demux-js-1.0.2.tgz#60852a597ecf11eb41b6b4483f496b626ed4f966" detect-indent@5.0.0: version "5.0.0" @@ -3588,7 +3583,7 @@ marked@^0.3.17: version "0.3.19" resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" -massive@^5.1.3, massive@^5.2.0: +massive@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/massive/-/massive-5.2.0.tgz#7b734c54c2230db37f161737d1339f3d9e4f879f" dependencies: