remove nested if, remove case for < 0x80 (by jhoenicke)

trezor · Jul 18, 2018 · 1c81a14 · 1c81a14
1 parent c581715
commit 1c81a14
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/firmware/ethereum.c b/firmware/ethereum.c
@@ -568,10 +568,7 @@ void ethereum_signing_init(EthereumSignTx *msg, const HDNode *node)
 		rlp_length += rlp_calculate_length(1, tx_type);
 	}
 	if (chain_id) {
-		int length = 0;
-		if (msg->has_chain_id) {
-			length = chain_id < 0x80 ? 0: chain_id < 0x100 ? 1: chain_id < 0x10000 ? 2: chain_id < 0x1000000 ? 3 : 4;
-		}
+		int length = chain_id < 0x100 ? 1: chain_id < 0x10000 ? 2: chain_id < 0x1000000 ? 3 : 4;
 		rlp_length += rlp_calculate_length(length, chain_id);
 		rlp_length += rlp_calculate_length(0, 0);
 		rlp_length += rlp_calculate_length(0, 0);