heibai2006/web3.php
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Change utils::toHex.

Browse Source
This commit is contained in:
sc0Vu 2018-01-25 11:49:21 +08:00
parent 4df52132d0
commit ed57c92446
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Utils.php
View File

@ -74,20 +74,32 @@ class Utils
/** /**
* toHex * toHex
* Encoding string or integer or numeric string(is not zero prefixed) or bug number to hex.
* *
* @param string $value * @param string|int|BigNumber $value
* @param bool $isPrefix * @param bool $isPrefix
* @return string * @return string
*/ */
public static function toHex($value, $isPrefix=false) public static function toHex($value, $isPrefix=false)
{ {
if (!is_string($value)) { if (is_numeric($value)) {
throw new InvalidArgumentException('The value to toHex function must be string.'); // turn to hex number
$bn = self::toBn($value);
$hex = $bn->toHex(true);
$hex = preg_replace('/^0+(?!$)/', '', $hex);
} elseif ($value instanceof BigNumber) {
$hex = $value->toHex(true);
$hex = preg_replace('/^0+(?!$)/', '', $hex);
} elseif (is_string($value)) {
$value = self::stripZero($value);
$hex = implode('', unpack('H*', $value));
} else {
throw new InvalidArgumentException('The value to toHex function is not support.');
} }
if ($isPrefix) { if ($isPrefix) {
return '0x' . implode('', unpack('H*', $value)); return '0x' . $hex;
} }
return implode('', unpack('H*', $value)); return $hex;
} }
/** /**

22
test/unit/UtilsTest.php
View File

@ -4,7 +4,7 @@ namespace Test\Unit;
use InvalidArgumentException; use InvalidArgumentException;
use Test\TestCase; use Test\TestCase;
use phpseclib\Math\BigInteger; use phpseclib\Math\BigInteger as BigNumber;
use Web3\Utils; use Web3\Utils;
class UtilsTest extends TestCase class UtilsTest extends TestCase
@ -68,13 +68,23 @@ class UtilsTest extends TestCase
*/ */
public function testToHex() public function testToHex()
{ {
$hex = Utils::toHex('hello world'); $this->assertEquals($this->testHex, Utils::toHex('hello world'));
$this->assertEquals('0x' . $this->testHex, Utils::toHex('hello world', true));
$this->assertEquals($hex, $this->testHex); $this->assertEquals('0x927c0', Utils::toHex(0x0927c0, true));
$this->assertEquals('0x927c0', Utils::toHex('600000', true));
$this->assertEquals('0x927c0', Utils::toHex(600000, true));
$this->assertEquals('0x927c0', Utils::toHex(new BigNumber(600000), true));
$this->assertEquals('0xea60', Utils::toHex(0x0ea60, true));
$this->assertEquals('0xea60', Utils::toHex('60000', true));
$this->assertEquals('0xea60', Utils::toHex(60000, true));
$this->assertEquals('0xea60', Utils::toHex(new BigNumber(60000), true));
$hexPrefixed = Utils::toHex('hello world', true); $this->assertEquals('0x', Utils::toHex(0x00, true));
$this->assertEquals('0x', Utils::toHex('0', true));
$this->assertEquals($hexPrefixed, '0x' . $this->testHex); $this->assertEquals('0x', Utils::toHex(0, true));
$this->assertEquals('0x', Utils::toHex(new BigNumber(0), true));
} }
/** /**