diff --git a/service/node.ts b/service/node.ts index 3537238..cba6de0 100644 --- a/service/node.ts +++ b/service/node.ts @@ -16,6 +16,7 @@ class LightClient { async start(): Promise { if (checkLightClientWasm()){ await request(1,this.url,"start",[]) + await sleep(5*1000) return true } await sh("cd " + this.dirPath + "/target/release && RUST_LOG=info,ckb_light_client=trace ./ckb-light-client run --config-file ./config.toml > node.log 2>&1 &") diff --git a/service/txService.ts b/service/txService.ts index 85f3f47..898baa0 100644 --- a/service/txService.ts +++ b/service/txService.ts @@ -122,7 +122,7 @@ export async function getCkbTransactionList(scriptObject: Script, script_type: S }, "asc", - BI.from(3000).toHexString(), lastCursor + BI.from(1000).toHexString(), lastCursor ) if (result.objects.length == 0) { return txList @@ -158,7 +158,7 @@ export async function getLightTransactionList(scriptObject: Script, script_type: }, "asc", - BI.from(3000).toHexString(),lastCursor + BI.from(1000).toHexString(),lastCursor ) if (result.objects.length == 0) { return txList @@ -193,7 +193,7 @@ export async function getTransactionsLength(scriptObject: Script, script_type: S }, "asc", - BI.from(3000).toHexString() + BI.from(1000).toHexString() ) if (result.objects.length == 0) { break @@ -216,7 +216,7 @@ export async function getCellsByRange(scriptObject: Script, script_type: ScriptT filter: { blockRange: block_range } - }, "asc", "0xfff", lastCursor) + }, "asc", "0x1ff", lastCursor) if (result.objects.length == 0) { break } diff --git a/test/get_header.spec.ts b/test/get_header.spec.ts index ca45bcf..ddd7439 100644 --- a/test/get_header.spec.ts +++ b/test/get_header.spec.ts @@ -9,7 +9,10 @@ import {waitScriptsUpdate} from "../service/lightService"; describe('get_header', function () { this.timeout(600_000) - + it("dd",async ()=>{ + let acc = generateAccountFromPrivateKey(ACCOUNT_PRIVATE) + console.log(acc) + }) it("query the hash that does not exist on the ckb chain,should return null", async () => { let response = await getHeader("0x1d7c6f92fa3335bf01c3f43f8970cb586d2dee81b90d363169dbe1bba98d6c11") console.log('response:', response) @@ -20,7 +23,7 @@ describe('get_header', function () { let script = generateAccountFromPrivateKey(ACCOUNT_PRIVATE).lockScript let cells = await indexerMockLightRpc.getCells({ script:script,scriptType:"lock" - }, "asc","0xfff") + }, "asc","0x1ff") // set scripts :( account,cells[0].height -1 ) ,want to collected cells that not used ; await lightClientRPC.setScripts([{script: script,scriptType:"lock", blockNumber: BI.from(cells.objects[0].blockNumber).sub(1).toHexString()}]) @@ -32,7 +35,7 @@ describe('get_header', function () { let response = await lightClientRPC.getCells({ script:script, scriptType:"lock" - }, "asc", "0xfff") + }, "asc", "0x1ff") let block = await rpcCLient.getBlockByNumber(response.objects[0].blockNumber.toString()) if (block == undefined) { diff --git a/test/get_transactions.spec.ts b/test/get_transactions.spec.ts index cf7d5a2..db501c7 100644 --- a/test/get_transactions.spec.ts +++ b/test/get_transactions.spec.ts @@ -26,7 +26,7 @@ describe('get_transactions', function () { let txs = await rpcCLient.getTransactions({ "script": test_scripts[0].script, "scriptType": test_scripts[0].scriptType, "groupByTransaction": true - }, "asc", "0xfff") + }, "asc", "0x1ff") console.log(txs.objects[0].blockNumber) console.log(txs.objects[txs.objects.length - 1].blockNumber) await lightClientRPC.setScripts([ @@ -51,7 +51,7 @@ describe('get_transactions', function () { filter: { blockRange: [BI.from(12112687).sub(1).toHexString(), BI.from(12116260).toHexString()], } - }, "asc", "0xfff", lightAfterCursor + }, "asc", "0x1ff", lightAfterCursor ) let ckbTxs = await rpcCLient.getTransactions({ "script": test_scripts[0].script, "scriptType": test_scripts[0].scriptType, @@ -59,20 +59,20 @@ describe('get_transactions', function () { filter: { blockRange: [BI.from(12112687).sub(1).toHexString(), BI.from(12116260).toHexString()], } - }, "asc", "0xfff", ckbAfterCursor) + }, "asc", "0x1ff", ckbAfterCursor) console.log("lightTxs.objects.length:", lightTxs.objects.length) console.log("ckbTxs.objects.length:", ckbTxs.objects.length) - expect(lightTxs.objects.length == ckbTxs.objects.length, "light txs length not equal ckb txs length") + expect(lightTxs.objects.length ).to.be.equal( ckbTxs.objects.length, "light txs length not equal ckb txs length") for (let i = 0; i < lightTxs.objects.length; i++) { let lightTx = lightTxs.objects[i] let ckbTx = ckbTxs.objects[i] // console.log("lightTx:", lightTx) // console.log("ckbTx:", ckbTx) - expect(lightTx.transaction.hash == ckbTx.txHash, "light tx hash not equal ckb tx hash") - expect(lightTx.blockNumber == ckbTx.blockNumber, "light block number not equal ckb tx hash") - expect(lightTx.ioIndex == ckbTx.ioIndex, "light block number not equal ckb tx hash") - expect(lightTx.txIndex == ckbTx.txIndex, "light block number not equal ckb tx hash") + expect(lightTx.transaction.hash).to.be.equal(ckbTx.txHash, "light tx hash not equal ckb tx hash") + expect(lightTx.blockNumber ).to.be.equal( ckbTx.blockNumber, "light block number not equal ckb tx hash") + expect(lightTx.ioIndex ).to.be.equal( ckbTx.ioIndex, "light block number not equal ckb tx hash") + expect(lightTx.txIndex ).to.be.equal( ckbTx.txIndex, "light block number not equal ckb tx hash") } lightAfterCursor = lightTxs.lastCursor ckbAfterCursor = ckbTxs.lastCursor @@ -93,7 +93,7 @@ describe('get_transactions', function () { filter: { blockRange: [BI.from(12112687).sub(1).toHexString(), BI.from(12116260).toHexString()], } - }, "asc", BI.from(5000).toHexString(), lightAfterCursor + }, "asc", BI.from(1000).toHexString(), lightAfterCursor ) if(lightTxs.objects.length == 0){ return @@ -105,18 +105,20 @@ describe('get_transactions', function () { filter: { blockRange: [BI.from(12112687).sub(1).toHexString(), BI.from(12116260).toHexString()], } - }, "asc", BI.from(5000).toHexString(), ckbAfterCursor) + }, "asc", BI.from(1000).toHexString(), ckbAfterCursor) console.log("lightTxs.objects.length:", lightTxs.objects.length) console.log("ckbTxs.objects.length:", ckbTxs.objects.length) - expect(lightTxs.objects.length == ckbTxs.objects.length, "light txs length not equal ckb txs length") + expect(lightTxs.objects.length ).to.be.equal( ckbTxs.objects.length, "light txs length not equal ckb txs length") for (let i = 0; i < lightTxs.objects.length; i++) { let lightTx = lightTxs.objects[i] let ckbTx = ckbTxs.objects[i] - expect(lightTx.transaction.hash == ckbTx.txHash, "light tx hash not equal ckb tx hash") - expect(lightTx.blockNumber == ckbTx.blockNumber, "light block number not equal ckb tx hash") - expect(lightTx.cells == ckbTx.cells, "light block number not equal ckb tx hash") - expect(lightTx.txIndex == ckbTx.txIndex, "light block number not equal ckb tx hash") + // console.log("index:",i," lightTx:", lightTx.transaction.hash,JSON.stringify(lightTx.cells) ) + // console.log("ckbTx:", ckbTx.txHash) + expect(lightTx.transaction.hash ).to.be.equal( ckbTx.txHash, "light tx hash not equal ckb tx hash") + expect(lightTx.blockNumber ).to.be.equal( ckbTx.blockNumber, "light block number not equal ckb tx hash") + expect(JSON.stringify(lightTx.cells) ).to.be.equal( JSON.stringify(ckbTx.cells), "light block number not equal ckb tx hash") + expect(lightTx.txIndex ).to.be.equal( ckbTx.txIndex, "light block number not equal ckb tx hash") } lightAfterCursor = lightTxs.lastCursor ckbAfterCursor = ckbTxs.lastCursor @@ -125,4 +127,4 @@ describe('get_transactions', function () { } }) -}); +}); \ No newline at end of file