From f571d6d53c532b20f4b578c53e77e6260527e6a7 Mon Sep 17 00:00:00 2001 From: Tadeas Kmenta Date: Tue, 23 Jul 2024 20:49:03 +0700 Subject: [PATCH 1/9] Update hashes.json --- helpers/hashes.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/hashes.json b/helpers/hashes.json index 0449da1d8..5dd7b8a2f 100644 --- a/helpers/hashes.json +++ b/helpers/hashes.json @@ -3,5 +3,6 @@ "422fb5c5ee75b4f0739ace348d6e7b82", "459a0f8ee02e370b4a30c130dd3156f8", "98a0db6d9ca3a096606d5a95a8d2aa89", - "a267c50970dcdc48985c9c1247f37d74" + "a267c50970dcdc48985c9c1247f37d74", + "cb1c497ca97d8ffcb9baae41fa0bfe7e" ] From 886996dc6adf04bd6dc88e6aec790ae5a5c286b1 Mon Sep 17 00:00:00 2001 From: Tadeas Kmenta Date: Tue, 30 Jul 2024 20:33:20 +0700 Subject: [PATCH 2/9] Update hashes.json --- helpers/hashes.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/hashes.json b/helpers/hashes.json index 5dd7b8a2f..9f7fa3615 100644 --- a/helpers/hashes.json +++ b/helpers/hashes.json @@ -4,5 +4,6 @@ "459a0f8ee02e370b4a30c130dd3156f8", "98a0db6d9ca3a096606d5a95a8d2aa89", "a267c50970dcdc48985c9c1247f37d74", - "cb1c497ca97d8ffcb9baae41fa0bfe7e" + "cb1c497ca97d8ffcb9baae41fa0bfe7e", + "ba0ac54e74606a381bff24b019f9a255" ] From 76aeccb5450b6c1a5ef9552e8fc5d36967ab4865 Mon Sep 17 00:00:00 2001 From: Tadeas Kmenta Date: Tue, 30 Jul 2024 20:57:13 +0700 Subject: [PATCH 3/9] Update hashes.json --- helpers/hashes.json | 1 - 1 file changed, 1 deletion(-) diff --git a/helpers/hashes.json b/helpers/hashes.json index 9f7fa3615..d92f43dea 100644 --- a/helpers/hashes.json +++ b/helpers/hashes.json @@ -1,5 +1,4 @@ [ - "7cbfce1dd56f4e89f8c7a25858892ead", "422fb5c5ee75b4f0739ace348d6e7b82", "459a0f8ee02e370b4a30c130dd3156f8", "98a0db6d9ca3a096606d5a95a8d2aa89", From 9049dab27c726021286d627786b2b8b1d6d00327 Mon Sep 17 00:00:00 2001 From: Cabecinha84 <42519726+Cabecinha84@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:08:00 +0100 Subject: [PATCH 4/9] Block gridprueba1 as app specs are not ok --- helpers/blockedrepositories.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/blockedrepositories.json b/helpers/blockedrepositories.json index 46a431d91..ffedf3896 100644 --- a/helpers/blockedrepositories.json +++ b/helpers/blockedrepositories.json @@ -57,5 +57,6 @@ "1060dc623fcfbca15149ab3d776cb90fd4620ad0a6a91bad7ff125e11708b484", "6b6a47a2b0bb9f9405e4768c446dedd781f0b0e51f65c310d2095085b8e70e80", "dfdadb3858282fdf2d89fe21dc1909406d6f2f617f2bfa2e6ad1c9b7908cd878", - "4a5828ec4dddfacbc3367723a21c7a3646f57a63e569ae372047333d97779bed" + "4a5828ec4dddfacbc3367723a21c7a3646f57a63e569ae372047333d97779bed", + "de426c69eed13f8bf9513b91a0e2506af70290d46fc6ccaa2324012c75dcae8b" ] From 9c499d30c7094c326c39942c571c69fcd170a1be Mon Sep 17 00:00:00 2001 From: Cabecinha84 <42519726+Cabecinha84@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:57:10 +0100 Subject: [PATCH 5/9] Add gridprueba broken app --- helpers/blockedrepositories.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/blockedrepositories.json b/helpers/blockedrepositories.json index ffedf3896..e58cead6d 100644 --- a/helpers/blockedrepositories.json +++ b/helpers/blockedrepositories.json @@ -58,5 +58,6 @@ "6b6a47a2b0bb9f9405e4768c446dedd781f0b0e51f65c310d2095085b8e70e80", "dfdadb3858282fdf2d89fe21dc1909406d6f2f617f2bfa2e6ad1c9b7908cd878", "4a5828ec4dddfacbc3367723a21c7a3646f57a63e569ae372047333d97779bed", - "de426c69eed13f8bf9513b91a0e2506af70290d46fc6ccaa2324012c75dcae8b" + "de426c69eed13f8bf9513b91a0e2506af70290d46fc6ccaa2324012c75dcae8b", + "6718b5e140301c815ef2f8f0fec1a6ad8fa853f68b85a69828cfaa8f75470910" ] From 0f9dfc2950e68fb1d4a9d869443d1f3663ce23f8 Mon Sep 17 00:00:00 2001 From: Cabecinha84 <42519726+Cabecinha84@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:59:51 +0100 Subject: [PATCH 6/9] Block 321 broken app --- helpers/blockedrepositories.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/blockedrepositories.json b/helpers/blockedrepositories.json index e58cead6d..d7b8b64ea 100644 --- a/helpers/blockedrepositories.json +++ b/helpers/blockedrepositories.json @@ -59,5 +59,6 @@ "dfdadb3858282fdf2d89fe21dc1909406d6f2f617f2bfa2e6ad1c9b7908cd878", "4a5828ec4dddfacbc3367723a21c7a3646f57a63e569ae372047333d97779bed", "de426c69eed13f8bf9513b91a0e2506af70290d46fc6ccaa2324012c75dcae8b", - "6718b5e140301c815ef2f8f0fec1a6ad8fa853f68b85a69828cfaa8f75470910" + "6718b5e140301c815ef2f8f0fec1a6ad8fa853f68b85a69828cfaa8f75470910", + "c806276870c9a14fc474b7ab228e0c2e919fdebde56f85151865157b7a24f758" ] From c82bf89a0618e0582f752027175b1dd9dc85c4d9 Mon Sep 17 00:00:00 2001 From: Cabecinha84 <42519726+Cabecinha84@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:03:51 +0100 Subject: [PATCH 7/9] Add cigedi broken app --- helpers/blockedrepositories.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/blockedrepositories.json b/helpers/blockedrepositories.json index d7b8b64ea..5a0f772fc 100644 --- a/helpers/blockedrepositories.json +++ b/helpers/blockedrepositories.json @@ -60,5 +60,6 @@ "4a5828ec4dddfacbc3367723a21c7a3646f57a63e569ae372047333d97779bed", "de426c69eed13f8bf9513b91a0e2506af70290d46fc6ccaa2324012c75dcae8b", "6718b5e140301c815ef2f8f0fec1a6ad8fa853f68b85a69828cfaa8f75470910", - "c806276870c9a14fc474b7ab228e0c2e919fdebde56f85151865157b7a24f758" + "c806276870c9a14fc474b7ab228e0c2e919fdebde56f85151865157b7a24f758", + "30b142d93719d54b9ceb9a860552397770314aa93f892be3214ffc251fd67883" ] From 22b80e5f71dc42949376341742057f4494f167a4 Mon Sep 17 00:00:00 2001 From: Tadeas Kmenta Date: Fri, 9 Aug 2024 19:27:44 +0700 Subject: [PATCH 8/9] Update hashes.json --- helpers/hashes.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/helpers/hashes.json b/helpers/hashes.json index d92f43dea..39c6db4f9 100644 --- a/helpers/hashes.json +++ b/helpers/hashes.json @@ -4,5 +4,6 @@ "98a0db6d9ca3a096606d5a95a8d2aa89", "a267c50970dcdc48985c9c1247f37d74", "cb1c497ca97d8ffcb9baae41fa0bfe7e", - "ba0ac54e74606a381bff24b019f9a255" + "ba0ac54e74606a381bff24b019f9a255", + "fd5a4c764f09562a2fcbe573ff8077a3" ] From e30f3830c2681f47553bf19598ec80fd06bbe776 Mon Sep 17 00:00:00 2001 From: bytetigers Date: Tue, 13 Aug 2024 21:46:57 +0800 Subject: [PATCH 9/9] chore: fix some comments Signed-off-by: bytetigers --- ZelBack/src/services/appsService.js | 2 +- tests/unit/benchmarkService.test.js | 2 +- tests/unit/fluxCommunication.test.js | 2 +- tests/unit/fluxCommunicationMessagesSender.test.js | 2 +- tests/unit/socketIoServer.test.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZelBack/src/services/appsService.js b/ZelBack/src/services/appsService.js index 153872d8f..529fe1de1 100644 --- a/ZelBack/src/services/appsService.js +++ b/ZelBack/src/services/appsService.js @@ -5542,7 +5542,7 @@ function verifyRestrictionCorrectnessOfApp(appSpecifications, height) { } // check wheter shared Folder is not root if (appComponent.containerData.length < 2) { - throw new Error(`Flux App container data folder not specified in in ${appComponent.name}. If no data folder is whished, use /tmp`); + throw new Error(`Flux App container data folder not specified in ${appComponent.name}. If no data folder is whished, use /tmp`); } if (appSpecifications.version >= 7) { diff --git a/tests/unit/benchmarkService.test.js b/tests/unit/benchmarkService.test.js index 5e1a167fa..b5d3e89e2 100644 --- a/tests/unit/benchmarkService.test.js +++ b/tests/unit/benchmarkService.test.js @@ -290,7 +290,7 @@ describe('benchmarkService tests', () => { describe.skip('signFluxTransactionPost tests', () => { // TODO: These tests are going to be altered when we're switching all requests from streams to body.parse. - // As they are right now - it's almost impossible to test without actually starting the deamon or without using hacky workarounds + // As they are right now - it's almost impossible to test without actually starting the daemon or without using hacky workarounds beforeEach(async () => { sinon.stub(fs, 'stat').resolves(true); diff --git a/tests/unit/fluxCommunication.test.js b/tests/unit/fluxCommunication.test.js index ac4619284..f6faa8466 100644 --- a/tests/unit/fluxCommunication.test.js +++ b/tests/unit/fluxCommunication.test.js @@ -1340,7 +1340,7 @@ describe('fluxCommunication tests', () => { sinon.restore(); }); - it('should send warning if deamon is not synced', async () => { + it('should send warning if daemon is not synced', async () => { daemonServiceStub.returns({ data: { synced: false, diff --git a/tests/unit/fluxCommunicationMessagesSender.test.js b/tests/unit/fluxCommunicationMessagesSender.test.js index f6fa73d9b..fd544f377 100644 --- a/tests/unit/fluxCommunicationMessagesSender.test.js +++ b/tests/unit/fluxCommunicationMessagesSender.test.js @@ -2131,7 +2131,7 @@ describe('fluxCommunicationMessagesSender tests', () => { sinon.assert.notCalled(websocketOut.send); }); - it('should throw an error if the message.singature is not a string', async () => { + it('should throw an error if the message.signature is not a string', async () => { const temporaryAppMessage = { // specification of temp message, these are not verified in this function type: 'fluxapp', version: 3, diff --git a/tests/unit/socketIoServer.test.js b/tests/unit/socketIoServer.test.js index 9db5e284f..b60c9a5aa 100644 --- a/tests/unit/socketIoServer.test.js +++ b/tests/unit/socketIoServer.test.js @@ -37,7 +37,7 @@ describe('FluxSocketServer tests', () => { expect(ioServer.io.opts.transports).to.deep.equal(['websocket']); expect(ioServer.io.opts.cors).to.deep.equal({ origin: '/test', methods: ['GET'] }); - // this would be a lot easier to test if the error event called the handler direclty + // this would be a lot easier to test if the error event called the handler directly errorHandlers[0](); expect(logged).to.equal(true); });