- Removed hard coded precision in PriceCurrency class.

- PriceCurrency now uses the DEFAULT_PRECISION constant for rounding.
- Cleanup convertAndRound function, so rounding only takes place in one function.

Author: dverkade

app/code/Magento/Directory/Model/PriceCurrency.php

@@ -62,9 +62,7 @@ public function convert($amount, $scope = null, $currency = null)
      */
     public function convertAndRound($amount, $scope = null, $currency = null, $precision = self::DEFAULT_PRECISION)
     {
-        $currentCurrency = $this->getCurrency($scope, $currency);
-        $convertedValue = $this->getStore($scope)->getBaseCurrency()->convert($amount, $currentCurrency);
-        return round($convertedValue, $precision);
+        return $this->round($this->convert($amount, $scope, $currency), $precision);
     }
 
     /**
@@ -148,13 +146,10 @@ protected function getStore($scope = null)
     }
 
     /**
-     * Round price
-     *
-     * @param float $price
-     * @return float
+     * {@inheritdoc}
      */
-    public function round($price)
+    public function round($price, $precision = self::DEFAULT_PRECISION)
     {
-        return round($price, 2);
+        return round($price, $precision);
     }
 }

lib/internal/Magento/Framework/Pricing/PriceCurrencyInterface.php

@@ -79,9 +79,10 @@ public function convertAndFormat(
      * Round price
      *
      * @param float $price
+     * @param int $precision
      * @return float
      */
-    public function round($price);
+    public function round($price, $precision = self::DEFAULT_PRECISION);
 
     /**
      * Get currency model