From 7e1c8b14d43200d74c99fb667a15f7dd99525aef Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Tue, 8 Mar 2022 18:19:07 +0100
Subject: [PATCH] Small refactoring on number of NFT selectors

---
 src_plugins/erc1155/erc1155_plugin.c | 6 +++---
 src_plugins/erc1155/erc1155_plugin.h | 3 +--
 src_plugins/erc721/erc721_plugin.c   | 6 +++---
 src_plugins/erc721/erc721_plugin.h   | 3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src_plugins/erc1155/erc1155_plugin.c b/src_plugins/erc1155/erc1155_plugin.c
index 9554497..9fa73f6 100644
--- a/src_plugins/erc1155/erc1155_plugin.c
+++ b/src_plugins/erc1155/erc1155_plugin.c
@@ -9,7 +9,7 @@ static const uint8_t ERC1155_APPROVE_FOR_ALL_SELECTOR[SELECTOR_SIZE] = {0xa2, 0x
 static const uint8_t ERC1155_SAFE_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0xf2, 0x42, 0x43, 0x2a};
 static const uint8_t ERC1155_SAFE_BATCH_TRANSFER[SELECTOR_SIZE] = {0x2e, 0xb2, 0xc2, 0xd6};
 
-const uint8_t *const ERC1155_SELECTORS[NUM_ERC1155_SELECTORS] = {
+const uint8_t *const ERC1155_SELECTORS[SELECTORS_COUNT] = {
     ERC1155_APPROVE_FOR_ALL_SELECTOR,
     ERC1155_SAFE_TRANSFER_SELECTOR,
     ERC1155_SAFE_BATCH_TRANSFER,
@@ -20,7 +20,7 @@ static void handle_init_contract(void *parameters) {
     erc1155_context_t *context = (erc1155_context_t *) msg->pluginContext;
 
     uint8_t i;
-    for (i = 0; i < NUM_ERC1155_SELECTORS; i++) {
+    for (i = 0; i < SELECTORS_COUNT; i++) {
         if (memcmp((uint8_t *) PIC(ERC1155_SELECTORS[i]), msg->selector, SELECTOR_SIZE) == 0) {
             context->selectorIndex = i;
             break;
@@ -28,7 +28,7 @@ static void handle_init_contract(void *parameters) {
     }
 
     // No selector found.
-    if (i == NUM_ERC1155_SELECTORS) {
+    if (i == SELECTORS_COUNT) {
         PRINTF("Unknown erc1155 selector %.*H\n", SELECTOR_SIZE, msg->selector);
         msg->result = ETH_PLUGIN_RESULT_FALLBACK;
         return;
diff --git a/src_plugins/erc1155/erc1155_plugin.h b/src_plugins/erc1155/erc1155_plugin.h
index cb100c7..eb174bd 100644
--- a/src_plugins/erc1155/erc1155_plugin.h
+++ b/src_plugins/erc1155/erc1155_plugin.h
@@ -11,12 +11,11 @@
 
 // Internal plugin for EIP 1155: https://eips.ethereum.org/EIPS/eip-1155
 
-#define NUM_ERC1155_SELECTORS 3
-
 typedef enum {
     SET_APPROVAL_FOR_ALL,
     SAFE_TRANSFER,
     SAFE_BATCH_TRANSFER,
+    SELECTORS_COUNT
 } erc1155_selector_t;
 
 typedef enum {
diff --git a/src_plugins/erc721/erc721_plugin.c b/src_plugins/erc721/erc721_plugin.c
index 449aa96..e802a54 100644
--- a/src_plugins/erc721/erc721_plugin.c
+++ b/src_plugins/erc721/erc721_plugin.c
@@ -12,7 +12,7 @@ static const uint8_t ERC721_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0x23, 0xb8, 0x72
 static const uint8_t ERC721_SAFE_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0x42, 0x84, 0x2e, 0x0e};
 static const uint8_t ERC721_SAFE_TRANSFER_DATA_SELECTOR[SELECTOR_SIZE] = {0xb8, 0x8d, 0x4f, 0xde};
 
-const uint8_t *const ERC721_SELECTORS[NUM_ERC721_SELECTORS] = {
+const uint8_t *const ERC721_SELECTORS[SELECTORS_COUNT] = {
     ERC721_APPROVE_SELECTOR,
     ERC721_APPROVE_FOR_ALL_SELECTOR,
     ERC721_TRANSFER_SELECTOR,
@@ -25,7 +25,7 @@ static void handle_init_contract(void *parameters) {
     erc721_context_t *context = (erc721_context_t *) msg->pluginContext;
 
     uint8_t i;
-    for (i = 0; i < NUM_ERC721_SELECTORS; i++) {
+    for (i = 0; i < SELECTORS_COUNT; i++) {
         if (memcmp((uint8_t *) PIC(ERC721_SELECTORS[i]), msg->selector, SELECTOR_SIZE) == 0) {
             context->selectorIndex = i;
             break;
@@ -33,7 +33,7 @@ static void handle_init_contract(void *parameters) {
     }
 
     // No selector found.
-    if (i == NUM_ERC721_SELECTORS) {
+    if (i == SELECTORS_COUNT) {
         PRINTF("Unknown erc721 selector %.*H\n", SELECTOR_SIZE, msg->selector);
         msg->result = ETH_PLUGIN_RESULT_FALLBACK;
         return;
diff --git a/src_plugins/erc721/erc721_plugin.h b/src_plugins/erc721/erc721_plugin.h
index 17515f3..62870fa 100644
--- a/src_plugins/erc721/erc721_plugin.h
+++ b/src_plugins/erc721/erc721_plugin.h
@@ -10,14 +10,13 @@
 
 // Internal plugin for EIP 721: https://eips.ethereum.org/EIPS/eip-721
 
-#define NUM_ERC721_SELECTORS 5
-
 typedef enum {
     APPROVE,
     SET_APPROVAL_FOR_ALL,
     TRANSFER,
     SAFE_TRANSFER,
     SAFE_TRANSFER_DATA,
+    SELECTORS_COUNT
 } erc721_selector_t;
 
 typedef enum {