From 271752dd6df730616ece49e263299bf9826e68b0 Mon Sep 17 00:00:00 2001 From: tringuyenskymavis Date: Tue, 20 Aug 2024 00:03:53 +0700 Subject: [PATCH 1/3] chore: fix compare logic --- _reporter.js | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/_reporter.js b/_reporter.js index ba1dd59..4a2775b 100644 --- a/_reporter.js +++ b/_reporter.js @@ -280,16 +280,9 @@ function alignLayouts(layout1, layout2) { // IN: Storage item, storage item // OUT: True or false function isSame(item1, item2) { - // Remove number on type.value - if (item1.type.value && typeof item1.type.value === 'string') { - item1.type.value = item1.type.value.replace(/\)(\d+)(_storage)?/g, ')'); - } - if (item2.type.value && typeof item2.type.value === 'string') { - item2.type.value = item2.type.value.replace(/\)(\d+)(_storage)?/g, ')'); - } - - // Compare items by label and type - if (item1.label === item2.label && JSON.stringify(item1.type) === JSON.stringify(item2.type)) { + // Compare items by label and type.label and type.numberOfBytes and type.encoding + if (item1.label === item2.label && JSON.stringify(item1.type.encoding) === JSON.stringify(item2.type.encoding) + && JSON.stringify(item1.type.label) === JSON.stringify(item2.type.label) && JSON.stringify(item1.type.numberOfBytes) === JSON.stringify(item2.type.numberOfBytes)) { return true; // Items are equal } else { return false; // Items are not equal From 7680ae6f98b621ac7740cc8d72042360a0dec3c7 Mon Sep 17 00:00:00 2001 From: tringuyenskymavis Date: Tue, 20 Aug 2024 10:54:52 +0700 Subject: [PATCH 2/3] chore: clean code --- _reporter.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/_reporter.js b/_reporter.js index 4a2775b..9cf43f5 100644 --- a/_reporter.js +++ b/_reporter.js @@ -281,8 +281,11 @@ function alignLayouts(layout1, layout2) { // OUT: True or false function isSame(item1, item2) { // Compare items by label and type.label and type.numberOfBytes and type.encoding - if (item1.label === item2.label && JSON.stringify(item1.type.encoding) === JSON.stringify(item2.type.encoding) - && JSON.stringify(item1.type.label) === JSON.stringify(item2.type.label) && JSON.stringify(item1.type.numberOfBytes) === JSON.stringify(item2.type.numberOfBytes)) { + let isEncodingSame = JSON.stringify(item1.type.encoding) === JSON.stringify(item2.type.encoding); + let isLabelSame = item1.label === item2.label && item1.type.label === item2.type.label; + let isNumberOfBytesSame = JSON.stringify(item1.type.numberOfBytes) === JSON.stringify(item2.type.numberOfBytes); + + if (isEncodingSame && isLabelSame && isNumberOfBytesSame) { return true; // Items are equal } else { return false; // Items are not equal From ded9b890bd8b9d9d1362326d168fff3067a81fbd Mon Sep 17 00:00:00 2001 From: tringuyenskymavis Date: Tue, 20 Aug 2024 10:57:40 +0700 Subject: [PATCH 3/3] chore: fix naming --- _reporter.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_reporter.js b/_reporter.js index 9cf43f5..8caff88 100644 --- a/_reporter.js +++ b/_reporter.js @@ -281,11 +281,11 @@ function alignLayouts(layout1, layout2) { // OUT: True or false function isSame(item1, item2) { // Compare items by label and type.label and type.numberOfBytes and type.encoding - let isEncodingSame = JSON.stringify(item1.type.encoding) === JSON.stringify(item2.type.encoding); - let isLabelSame = item1.label === item2.label && item1.type.label === item2.type.label; - let isNumberOfBytesSame = JSON.stringify(item1.type.numberOfBytes) === JSON.stringify(item2.type.numberOfBytes); + let isSameEncoding = JSON.stringify(item1.type.encoding) === JSON.stringify(item2.type.encoding); + let isSameLabel = item1.label === item2.label && item1.type.label === item2.type.label; + let isSameNumberOfBytes = JSON.stringify(item1.type.numberOfBytes) === JSON.stringify(item2.type.numberOfBytes); - if (isEncodingSame && isLabelSame && isNumberOfBytesSame) { + if (isSameEncoding && isSameLabel && isSameNumberOfBytes) { return true; // Items are equal } else { return false; // Items are not equal