Approve second code review PR #6

PayCrypto · Jun 1, 2018 · 2cc0eff · 2cc0eff
1 parent fc13c82
commit 2cc0eff
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/src/Resource/GetAllRate.php b/src/Resource/GetAllRate.php
@@ -40,6 +40,6 @@ public function fetch(ImportConnector $connector): \Iterator
 
         $rates = new \ArrayIterator($response['rates']);
 
-        return new AllRatesRecord($rates, $this->base, count($response), $this);
+        return new AllRatesRecord($rates, $this->base, count($rates), $this);
     }
 }
diff --git a/src/Resource/GetSpecificRate.php b/src/Resource/GetSpecificRate.php
@@ -41,6 +41,6 @@ public function fetch(ImportConnector $connector): \Iterator
             true
         );
 
-        return new \ArrayIterator($response);
+        return yield $response;
     }
 }
diff --git a/tests/Functional/GetRateTest.php b/tests/Functional/GetRateTest.php
@@ -17,35 +17,30 @@ final class GetRateTest extends TestCase
 
     public function testGetSpecificRateRecords()
     {
-        /** @var \ArrayIterator $rates */
-        $rate = FixtureFactory::createPorter()->import(new ImportSpecification(new GetSpecificRate($this->apiKey)));
+        $rate = FixtureFactory::createPorter()->importOne(new ImportSpecification(new GetSpecificRate($this->apiKey)));
 
         $this->assertCount(1, $rate);
 
-        $rateRecords = iterator_to_array($rate);
-
-        foreach($rateRecords as $rateRecord) {
-            $this->assertArrayHasKey('asset_id_base', $rateRecord);
-            $this->assertArrayHasKey('asset_id_quote', $rateRecord);
-            $this->assertArrayHasKey('rate', $rateRecord);
-            $this->assertArrayHasKey('time', $rateRecord);
-        }
+        $this->assertArrayHasKey('asset_id_base', $rate[0]);
+        $this->assertArrayHasKey('asset_id_quote', $rate[0]);
+        $this->assertArrayHasKey('rate', $rate[0]);
+        $this->assertArrayHasKey('time', $rate[0]);
     }
 
     public function testGetAllRateRecords()
     {
         /** @var AllRatesRecord $rates */
         $rates = FixtureFactory::createPorter()->import(new ImportSpecification(new GetAllRate($this->apiKey)));
 
-        $rates = $rates->findFirstCollection();
-        $rateRecords = iterator_to_array($rates);
+        $this->assertCount(1267, $rates);
 
-        $this->assertSame('BTC', $rates->getBase());
-
-        foreach ($rateRecords as $rateRecord) {
+        foreach ($rates as $rateRecord) {
             $this->assertArrayHasKey('asset_id_quote', $rateRecord);
             $this->assertArrayHasKey('rate', $rateRecord);
             $this->assertArrayHasKey('time', $rateRecord);
         }
+
+        $rates = $rates->findFirstCollection();
+        $this->assertSame('BTC', $rates->getBase());
     }
 }