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

Add OptionalQuantityFormatter test.

Browse Source
This commit is contained in:
sc0Vu 2018-02-07 17:20:26 +08:00
parent a46bd2f029
commit e5698c99ed
3 changed files with 63 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Formatters/OptionalQuantityFormatter.php
View File

@ -15,6 +15,7 @@ use InvalidArgumentException;
use Web3\Utils;
use Web3\Formatters\IFormatter;
use Web3\Validators\TagValidator;
use Web3\Formatters\QuantityFormatter;
class OptionalQuantityFormatter implements IFormatter
{
@ -29,9 +30,6 @@ class OptionalQuantityFormatter implements IFormatter
if (TagValidator::validate($value)) {
return $value;
}
$value = Utils::toString($value);
$bn = Utils::toBn($value);
return '0x' . $bn->toHex(true);
return QuantityFormatter::format($value);
}
}

2
src/Formatters/QuantityFormatter.php
View File

@ -35,7 +35,7 @@ class QuantityFormatter implements IFormatter
$hex = preg_replace('/^0x0+(?!$)/', '', $value);
} else {
$bn = Utils::toBn($value);
$hex = $bn->toHex(true);
$hex = $bn->toHex(true);
}
if (empty($hex)) {
$hex = '0';

60
test/unit/OptionalQuantityFormatterTest.php Normal file
View File

@ -0,0 +1,60 @@
<?php
namespace Test\Unit;
use Test\TestCase;
use Web3\Formatters\OptionalQuantityFormatter;
class OptionalQuantityFormatterTest extends TestCase
{
/**
* formatter
*
* @var \Web3\Formatters\OptionalQuantityFormatter
*/
protected $formatter;
/**
* setUp
*
* @return void
*/
public function setUp()
{
parent::setUp();
$this->formatter = new OptionalQuantityFormatter;
}
/**
* testFormat
*
* @return void
*/
public function testFormat()
{
$formatter = $this->formatter;
$this->assertEquals('0x927c0', $formatter->format(0x0927c0));
$this->assertEquals('0x927c0', $formatter->format('0x0927c0'));
$this->assertEquals('0x927c0', $formatter->format('0x927c0'));
$this->assertEquals('0x927c0', $formatter->format('600000'));
$this->assertEquals('0x927c0', $formatter->format(600000));
$this->assertEquals('0xea60', $formatter->format('0x0ea60'));
$this->assertEquals('0xea60', $formatter->format('0xea60'));
$this->assertEquals('0xea60', $formatter->format(0x0ea60));
$this->assertEquals('0xea60', $formatter->format('60000'));
$this->assertEquals('0xea60', $formatter->format(60000));
$this->assertEquals('0x0', $formatter->format(0x00));
$this->assertEquals('0x0', $formatter->format('0x00'));
$this->assertEquals('0x0', $formatter->format('0x0'));
$this->assertEquals('0x0', $formatter->format('0'));
$this->assertEquals('0x0', $formatter->format(0));
$this->assertEquals('latest', $formatter->format('latest'));
$this->assertEquals('earliest', $formatter->format('earliest'));
$this->assertEquals('pending', $formatter->format('pending'));
$this->assertEquals('0x0', $formatter->format('hello'));
}
}