Return first byte when it's less than 127

Bradez · Oct 15, 2020 · 528e4f7 · 528e4f7
1 parent 8a4b007
commit 528e4f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/RLP.php b/src/RLP.php
@@ -113,18 +113,19 @@ public function decode(string $input)
      */
     protected function decodeData(string $input)
     {
-        $firstByte = hexdec(mb_substr($input, 0, 2));
+        $firstByte = mb_substr($input, 0, 2);
+        $firstByteDec = hexdec($firstByte);
 
-        if ($firstByte <= 0x7f) {
+        if ($firstByteDec <= 0x7f) {
             return [
-                'data' => dechex($firstByte),
+                'data' => $firstByte,
                 'remainder' => mb_substr($input, 2)
             ];
-        } elseif ($firstByte <= 0xb7) {
-            $length = $firstByte - 0x7f;
+        } elseif ($firstByteDec <= 0xb7) {
+            $length = $firstByteDec - 0x7f;
             $data = '';
 
-            if ($firstByte !== 0x80) {
+            if ($firstByteDec !== 0x80) {
                 $data = mb_substr($input, 2, ($length - 1) * 2);
             }
             $firstByteData = hexdec(mb_substr($data, 0, 2));
@@ -135,8 +136,8 @@ protected function decodeData(string $input)
                 'data' => $data,
                 'remainder' => mb_substr($input, $length * 2)
             ];
-        } elseif ($firstByte <= 0xbf) {
-            $llength = $firstByte - 0xb6;
+        } elseif ($firstByteDec <= 0xbf) {
+            $llength = $firstByteDec - 0xb6;
             $hexLength = mb_substr($input, 2, ($llength - 1) * 2);
 
             if ($hexLength === '00') {
@@ -152,8 +153,8 @@ protected function decodeData(string $input)
                 'data' => $data,
                 'remainder' => mb_substr($input, ($length + $llength) * 2)
             ];
-        } elseif ($firstByte <= 0xf7) {
-            $length = $firstByte - 0xbf;
+        } elseif ($firstByteDec <= 0xf7) {
+            $length = $firstByteDec - 0xbf;
             $innerRemainder = mb_substr($input, 2, ($length - 1) * 2);
             $decoded = [];
 
@@ -167,7 +168,7 @@ protected function decodeData(string $input)
                 'remainder' => mb_substr($input, $length * 2)
             ];
         } else {
-            $llength = $firstByte - 0xf6;
+            $llength = $firstByteDec - 0xf6;
             $hexLength = mb_substr($input, 2, ($llength - 1) * 2);
             $decoded = [];
 

diff --git a/test/unit/RLPTest.php b/test/unit/RLPTest.php
@@ -34,7 +34,7 @@ class RLPTest extends TestCase
         ], [
             "decoded" => "0x00",
             "encoded" => "00",
-            "rlpdecoded" => "0"
+            "rlpdecoded" => "00"
         ], [
             "decoded" => "0x0400",
             "encoded" => "820400",