From cfbb58aa7f12f71856fa5b32302d0285785ac289 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 19 Aug 2022 14:30:28 +1000 Subject: [PATCH] fix: remove logs of HF 19.0 and 19.1 values --- ts/session/apis/snode_api/hfHandling.ts | 4 ++-- ts/session/sending/MessageSender.ts | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ts/session/apis/snode_api/hfHandling.ts b/ts/session/apis/snode_api/hfHandling.ts index fcfb7ea14..933beea00 100644 --- a/ts/session/apis/snode_api/hfHandling.ts +++ b/ts/session/apis/snode_api/hfHandling.ts @@ -78,12 +78,12 @@ export async function handleHardforkResult(json: Record) { isNumber(json.hf[1]) ) { if (!hasSeenHardfork190 && json.hf[0] >= 19 && json.hf[1] >= 0) { - window.log.info('[HF]: We just detected HF 19.0 on "retrieve"'); + // window.log.info('[HF]: We just detected HF 19.0 on "retrieve"'); await Data.createOrUpdateItem({ id: 'hasSeenHardfork190', value: true }); hasSeenHardfork190 = true; } if (!hasSeenHardfork191 && json.hf[0] >= 19 && json.hf[1] >= 1) { - window.log.info('[HF]: We just detected HF 19.1 on "retrieve"'); + // window.log.info('[HF]: We just detected HF 19.1 on "retrieve"'); await Data.createOrUpdateItem({ id: 'hasSeenHardfork191', value: true }); hasSeenHardfork191 = true; } diff --git a/ts/session/sending/MessageSender.ts b/ts/session/sending/MessageSender.ts index 23313fd93..393e6193c 100644 --- a/ts/session/sending/MessageSender.ts +++ b/ts/session/sending/MessageSender.ts @@ -20,7 +20,6 @@ import { getConversationController } from '../conversations'; import { ed25519Str } from '../onions/onionPath'; import { EmptySwarmError } from '../utils/errors'; import ByteBuffer from 'bytebuffer'; -import { getHasSeenHF190, getHasSeenHF191 } from '../apis/snode_api/hfHandling'; import { sendMessageOnionV4BlindedRequest, sendSogsMessageOnionV4, @@ -144,17 +143,18 @@ export async function sendMessageToSnode( const conversation = getConversationController().get(pubKey); const isClosedGroup = conversation?.isClosedGroup(); - const hardfork190Happened = await getHasSeenHF190(); - const hardfork191Happened = await getHasSeenHF191(); + // const hardfork190Happened = await getHasSeenHF190(); + // const hardfork191Happened = await getHasSeenHF191(); const namespace = isClosedGroup ? -10 : 0; - window?.log?.debug( - `Sending envelope with timestamp: ${timestamp} to ${ed25519Str(pubKey)} size base64: ${ - data64.length - }; hardfork190Happened:${hardfork190Happened}; hardfork191Happened:${hardfork191Happened} to namespace:${namespace}` - ); + // we could get rid of those now, but lets keep it in case we ever need to use the HF value again + // window?.log?.debug( + // `Sending envelope with timestamp: ${timestamp} to ${ed25519Str(pubKey)} size base64: ${ + // data64.length + // }; hardfork190Happened:${hardfork190Happened}; hardfork191Happened:${hardfork191Happened} to namespace:${namespace}` + // ); - const isBetweenBothHF = hardfork190Happened && !hardfork191Happened; + const isBetweenBothHF = false; //hardfork190Happened && !hardfork191Happened; // send parameters const params = {