From 77276a9f685af677918018767a4005698f57c5c8 Mon Sep 17 00:00:00 2001 From: Dadepo Aderemi Date: Fri, 18 Mar 2022 05:51:18 +0100 Subject: [PATCH] keeping notifyForkchoiceUpdate retry tests --- .../unit/executionEngine/httpRetry.test.ts | 136 +----------------- 1 file changed, 1 insertion(+), 135 deletions(-) diff --git a/packages/lodestar/test/unit/executionEngine/httpRetry.test.ts b/packages/lodestar/test/unit/executionEngine/httpRetry.test.ts index 972a832e647c..32252d419b22 100644 --- a/packages/lodestar/test/unit/executionEngine/httpRetry.test.ts +++ b/packages/lodestar/test/unit/executionEngine/httpRetry.test.ts @@ -3,7 +3,7 @@ import chaiAsPromised from "chai-as-promised"; import {fastify} from "fastify"; import {AbortController} from "@chainsafe/abort-controller"; import {fromHexString} from "@chainsafe/ssz"; -import {ExecutionEngineHttp, parseExecutionPayload, serializeExecutionPayload} from "../../../src/executionEngine/http"; +import {ExecutionEngineHttp} from "../../../src/executionEngine/http"; import {defaultExecutionEngineHttpOpts} from "../../../lib/executionEngine/http"; import {bytesToData, numToQuantity} from "../../../src/eth1/provider/utils"; @@ -57,116 +57,6 @@ describe("ExecutionEngine / http ", () => { ); }); - describe("getPayload", async () => { - it("getPayload with retry", async function () { - this.timeout("10 min"); - /** - * curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"engine_getPayload","params":["0x0"],"id":67}' http://localhost:8545 - */ - - errorResponsesBeforeSuccess = defaultExecutionEngineHttpOpts.retryAttempts - 1; - const request = {jsonrpc: "2.0", method: "engine_getPayloadV1", params: ["0x0"]}; - const response = { - jsonrpc: "2.0", - id: 67, - result: { - blockHash: "0xb084c10440f05f5a23a55d1d7ebcb1b3892935fb56f23cdc9a7f42c348eed174", - parentHash: "0xa0513a503d5bd6e89a144c3268e5b7e9da9dbf63df125a360e3950a7d0d67131", - feeRecipient: "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - stateRoot: "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45", - receiptsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", - logsBloom: - "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - prevRandao: "0x0000000000000000000000000000000000000000000000000000000000000000", - blockNumber: "0x1", - gasLimit: "0x989680", - gasUsed: "0x0", - timestamp: "0x5", - extraData: "0x", - baseFeePerGas: "0x7", - transactions: [], - }, - }; - returnValue = response; - - expect(errorResponsesBeforeSuccess).to.not.be.equal( - 0, - "errorResponsesBeforeSuccess should not be zero before request" - ); - const payload = await executionEngine.getPayload("0x0"); - - expect(serializeExecutionPayload(payload)).to.deep.equal(response.result, "Wrong returned payload"); - expect(reqJsonRpcPayload).to.deep.equal(request, "Wrong request JSON RPC payload"); - expect(errorResponsesBeforeSuccess).to.be.equal( - 0, - "errorResponsesBeforeSuccess should be zero after request with retries" - ); - }); - }); - - describe("notifyNewPayload", async function () { - it("notifyNewPayload with retry", async function () { - this.timeout("10 min"); - /** - * curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"engine_newPayloadV1","params":[{"blockHash":"0xb084c10440f05f5a23a55d1d7ebcb1b3892935fb56f23cdc9a7f42c348eed174","parentHash":"0xa0513a503d5bd6e89a144c3268e5b7e9da9dbf63df125a360e3950a7d0d67131","coinbase":"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b","stateRoot":"0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45","receiptRoot":"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421","logsBloom":"0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000","prevRandao":"0x0000000000000000000000000000000000000000000000000000000000000000","blockNumber":"0x1","gasLimit":"0x989680","gasUsed":"0x0","timestamp":"0x5","extraData":"0x","baseFeePerGas":"0x7","transactions":[]}],"id":67}' http://localhost:8545 - */ - errorResponsesBeforeSuccess = defaultExecutionEngineHttpOpts.retryAttempts - 1; - const executionEngine = new ExecutionEngineHttp( - { - urls: [baseUrl], - retryAttempts: defaultExecutionEngineHttpOpts.retryAttempts, - retryDelay: defaultExecutionEngineHttpOpts.retryDelay, - }, - controller.signal - ); - - const request = { - jsonrpc: "2.0", - method: "engine_newPayloadV1", - params: [ - { - blockHash: "0xb084c10440f05f5a23a55d1d7ebcb1b3892935fb56f23cdc9a7f42c348eed174", - parentHash: "0xa0513a503d5bd6e89a144c3268e5b7e9da9dbf63df125a360e3950a7d0d67131", - feeRecipient: "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - stateRoot: "0xca3149fa9e37db08d1cd49c9061db1002ef1cd58db2210f2115c8c989b2bdf45", - receiptsRoot: "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", - logsBloom: - "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - prevRandao: "0x0000000000000000000000000000000000000000000000000000000000000000", - blockNumber: "0x1", - gasLimit: "0x989680", - gasUsed: "0x0", - timestamp: "0x5", - extraData: "0x", - baseFeePerGas: "0x7", - transactions: [], - }, - ], - }; - returnValue = { - jsonrpc: "2.0", - id: 67, - result: { - status: "VALID", - latestValidHash: "0xb084c10440f05f5a23a55d1d7ebcb1b3892935fb56f23cdc9a7f42c348eed174", - }, - }; - - expect(errorResponsesBeforeSuccess).to.not.be.equal( - 0, - "errorResponsesBeforeSuccess should not be zero before request" - ); - const {status} = await executionEngine.notifyNewPayload(parseExecutionPayload(request.params[0])); - - expect(status).to.equal("VALID", "Wrong returned execute payload result"); - expect(reqJsonRpcPayload).to.deep.equal(request, "Wrong request JSON RPC payload"); - expect(errorResponsesBeforeSuccess).to.be.equal( - 0, - "errorResponsesBeforeSuccess should be zero after request with retries" - ); - }); - }); - describe("notifyForkchoiceUpdate", async function () { it("notifyForkchoiceUpdate no retry when no pay load attributes", async function () { /** @@ -255,28 +145,4 @@ describe("ExecutionEngine / http ", () => { ); }); }); - - it("error - unknown payload", async function () { - this.timeout("10 min"); - /** - * curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","method":"engine_getPayload","params":["0x123"],"id":67}' http://localhost:8545 - */ - - errorResponsesBeforeSuccess = defaultExecutionEngineHttpOpts.retryAttempts - 1; - const request = {jsonrpc: "2.0", method: "engine_getPayload", params: ["0x123"]}; - const response = {jsonrpc: "2.0", id: 67, error: {code: 5, message: "unknown payload"}}; - returnValue = response; - - expect(errorResponsesBeforeSuccess).to.not.be.equal( - 0, - "errorResponsesBeforeSuccess should not be zero before request" - ); - await expect(executionEngine.getPayload(request.params[0])).to.be.rejectedWith( - "JSON RPC error: unknown payload, engine_getPayload" - ); - expect(errorResponsesBeforeSuccess).to.be.equal( - 0, - "errorResponsesBeforeSuccess should be zero after request with retries" - ); - }); });