From 6be9b49228614a0b60f075bb917b220e61664bfe Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Tue, 8 Feb 2022 18:00:19 +0100
Subject: [PATCH] Updated ERC 1155 test

Removed hacky workaround. Also now properly waits for the promise of the last APDU.
---
 .../nanox_erc1155_batch_transfer/00009.png    |   1 +
 .../nanox_erc1155_batch_transfer/00010.png    | Bin 0 -> 382 bytes
 .../nanox_erc1155_transfer/00011.png          |   1 +
 .../nanox_erc1155_transfer/00012.png          | Bin 0 -> 382 bytes
 tests/src/erc1155.test.js                     |  26 ++++++------------
 5 files changed, 10 insertions(+), 18 deletions(-)
 create mode 120000 tests/snapshots/nanox_erc1155_batch_transfer/00009.png
 create mode 100644 tests/snapshots/nanox_erc1155_batch_transfer/00010.png
 create mode 120000 tests/snapshots/nanox_erc1155_transfer/00011.png
 create mode 100644 tests/snapshots/nanox_erc1155_transfer/00012.png

diff --git a/tests/snapshots/nanox_erc1155_batch_transfer/00009.png b/tests/snapshots/nanox_erc1155_batch_transfer/00009.png
new file mode 120000
index 0000000..10266b3
--- /dev/null
+++ b/tests/snapshots/nanox_erc1155_batch_transfer/00009.png
@@ -0,0 +1 @@
+00007.png
\ No newline at end of file
diff --git a/tests/snapshots/nanox_erc1155_batch_transfer/00010.png b/tests/snapshots/nanox_erc1155_batch_transfer/00010.png
new file mode 100644
index 0000000000000000000000000000000000000000..a58590b988714545e7960f7f400f360ffc5de41f
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h6`U|@9hba4!+nDh2#bl+hG9*4k?
zQuR0Wo;SViCn%lTo!KM1<N4}TE=HcdggMMWO)#+9qVMtfuIo`d{@hvG5;?=H`J4LR
zwRaoWTYkD{&h=R9r~cmWo@*^`Jj~vB?S%04iSHX8Jugc%7w6q}S$9stD?W?s37h2d
zbN=6BQ=c)nX~}a9mamQzXUH}rox2+;#n5>sAjk5Y(@*V<VKX}7_iWu-zpq7l>#~<V
z>rbuHu`7A_H&AxgwHf8y4cdKvg$JbB4n%ez%sZ31aBYd&Oo@(7)_WJ(Znl2o8^PD`
zFE`_Y-IS+Kdq0Q2-7r_C=}F(5ev`U`H~)QH|9$1FHE$YjoVax+e0xei%S`SAGlOm!
zp7{T3NA-mVOYb&rdU8MdyIHo@@7cE*uj@I+Zu{2i)KMSV-E~o<g|+p~`n%k)uwY2g
YmzUY2z`9|^y+a@|Pgg&ebxsLQ0JeLtivR!s

literal 0
HcmV?d00001

diff --git a/tests/snapshots/nanox_erc1155_transfer/00011.png b/tests/snapshots/nanox_erc1155_transfer/00011.png
new file mode 120000
index 0000000..489390a
--- /dev/null
+++ b/tests/snapshots/nanox_erc1155_transfer/00011.png
@@ -0,0 +1 @@
+00009.png
\ No newline at end of file
diff --git a/tests/snapshots/nanox_erc1155_transfer/00012.png b/tests/snapshots/nanox_erc1155_transfer/00012.png
new file mode 100644
index 0000000000000000000000000000000000000000..a58590b988714545e7960f7f400f360ffc5de41f
GIT binary patch
literal 382
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!2~2@x4h6`U|@9hba4!+nDh2#bl+hG9*4k?
zQuR0Wo;SViCn%lTo!KM1<N4}TE=HcdggMMWO)#+9qVMtfuIo`d{@hvG5;?=H`J4LR
zwRaoWTYkD{&h=R9r~cmWo@*^`Jj~vB?S%04iSHX8Jugc%7w6q}S$9stD?W?s37h2d
zbN=6BQ=c)nX~}a9mamQzXUH}rox2+;#n5>sAjk5Y(@*V<VKX}7_iWu-zpq7l>#~<V
z>rbuHu`7A_H&AxgwHf8y4cdKvg$JbB4n%ez%sZ31aBYd&Oo@(7)_WJ(Znl2o8^PD`
zFE`_Y-IS+Kdq0Q2-7r_C=}F(5ev`U`H~)QH|9$1FHE$YjoVax+e0xei%S`SAGlOm!
zp7{T3NA-mVOYb&rdU8MdyIHo@@7cE*uj@I+Zu{2i)KMSV-E~o<g|+p~`n%k)uwY2g
YmzUY2z`9|^y+a@|Pgg&ebxsLQ0JeLtivR!s

literal 0
HcmV?d00001

diff --git a/tests/src/erc1155.test.js b/tests/src/erc1155.test.js
index bb78883..a0117ca 100644
--- a/tests/src/erc1155.test.js
+++ b/tests/src/erc1155.test.js
@@ -16,17 +16,12 @@ test('[Nano ' + model.letter + '] Transfer ERC-1155', zemu(model, async (sim, et
   await send_apdu(eth.transport, set_plugin);
   await send_apdu(eth.transport, provide_nft_info);
   await send_apdu(eth.transport, sign_first);
-  send_apdu(eth.transport, sign_more);
+  let sign_promise = send_apdu(eth.transport, sign_more);
 
   await waitForAppScreen(sim, current_screen);
-  // Go to the reject screen
-  await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_transfer', [10]);
-  // Accepting the transaction somehow takes too long for Zemu and takes the same screenshot
-  // twice, so accept it manually
-  await sim.clickLeft();
-  await sim.clickBoth();
-  // Sleep so it has time to send the response APDU
-  await Zemu.sleep(500);
+  await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_transfer', [10, -1, 0]);
+
+  await sign_promise;
 }));
 
 test('[Nano ' + model.letter + '] Batch transfer ERC-1155', zemu(model, async (sim, eth) => {
@@ -44,15 +39,10 @@ test('[Nano ' + model.letter + '] Batch transfer ERC-1155', zemu(model, async (s
   await send_apdu(eth.transport, sign_first);
   await send_apdu(eth.transport, sign_more_1);
   await send_apdu(eth.transport, sign_more_2);
-  send_apdu(eth.transport, sign_more_3);
+  let sign_promise = send_apdu(eth.transport, sign_more_3);
 
   await waitForAppScreen(sim, current_screen);
-  // Go to the reject screen
-  await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_batch_transfer', [8]);
-  // Accepting the transaction somehow takes too long for Zemu and takes the same screenshot
-  // twice, so accept it manually
-  await sim.clickLeft();
-  await sim.clickBoth();
-  // Sleep so it has time to send the response APDU
-  await Zemu.sleep(500);
+  await sim.navigateAndCompareSnapshots('.', model.name + '_erc1155_batch_transfer', [8, -1, 0]);
+
+  await sign_promise;
 }));