Simplify FxTrade

modules/product/src/main/java/com/opengamma/strata/product/fx/FxTrade.java

@@ -5,7 +5,6 @@
  */
 package com.opengamma.strata.product.fx;
 
-import com.opengamma.strata.basics.currency.CurrencyPair;
 import com.opengamma.strata.product.ProductTrade;
 import com.opengamma.strata.product.TradeInfo;
 
@@ -23,16 +22,4 @@ public interface FxTrade extends ProductTrade {
   @Override
   public abstract FxProduct getProduct();
 
-  /**
-   * Gets the currency pair that the FX trade is based on, in conventional order.
-   * <p>
-   * This represents the main currency pair of the FX. If the trade settles in a
-   * third currency, that is not recorded here.
-   * 
-   * @return the currency pair
-   */
-  public default CurrencyPair getCurrencyPair() {
-    return getProduct().getCurrencyPair();
-  }
-
 }

modules/product/src/test/java/com/opengamma/strata/product/fx/FxNdfTradeTest.java

@@ -34,7 +34,7 @@ public class FxNdfTradeTest {
   public void test_of() {
     FxNdfTrade test = FxNdfTrade.of(TRADE_INFO, PRODUCT);
     assertEquals(test.getProduct(), PRODUCT);
-    assertEquals(test.getCurrencyPair(), PRODUCT.getCurrencyPair());
+    assertEquals(test.getProduct().getCurrencyPair(), PRODUCT.getCurrencyPair());
     assertEquals(test.getInfo(), TRADE_INFO);
     assertEquals(test.withInfo(TRADE_INFO).getInfo(), TRADE_INFO);
   }

modules/product/src/test/java/com/opengamma/strata/product/fx/FxSingleTradeTest.java

@@ -35,7 +35,7 @@ public class FxSingleTradeTest {
   public void test_of() {
     FxSingleTrade test = FxSingleTrade.of(TRADE_INFO, PRODUCT);
     assertEquals(test.getProduct(), PRODUCT);
-    assertEquals(test.getCurrencyPair(), PRODUCT.getCurrencyPair());
+    assertEquals(test.getProduct().getCurrencyPair(), PRODUCT.getCurrencyPair());
     assertEquals(test.getInfo(), TRADE_INFO);
     assertEquals(test.withInfo(TRADE_INFO).getInfo(), TRADE_INFO);
   }

modules/product/src/test/java/com/opengamma/strata/product/fx/FxSwapTradeTest.java

@@ -35,7 +35,7 @@ public class FxSwapTradeTest {
   public void test_of() {
     FxSwapTrade test = FxSwapTrade.of(TRADE_INFO, PRODUCT);
     assertEquals(test.getProduct(), PRODUCT);
-    assertEquals(test.getCurrencyPair(), PRODUCT.getCurrencyPair());
+    assertEquals(test.getProduct().getCurrencyPair(), PRODUCT.getCurrencyPair());
     assertEquals(test.getInfo(), TRADE_INFO);
     assertEquals(test.withInfo(TRADE_INFO).getInfo(), TRADE_INFO);
   }

modules/product/src/test/java/com/opengamma/strata/product/fxopt/FxSingleBarrierOptionTradeTest.java

@@ -68,7 +68,7 @@ public class FxSingleBarrierOptionTradeTest {
   public void test_builder() {
     FxSingleBarrierOptionTrade test = sut();
     assertEquals(test.getProduct(), PRODUCT);
-    assertEquals(test.getCurrencyPair(), PRODUCT.getCurrencyPair());
+    assertEquals(test.getProduct().getCurrencyPair(), PRODUCT.getCurrencyPair());
     assertEquals(test.getInfo(), TRADE_INFO);
     assertEquals(test.getPremium(), PREMIUM);
     assertEquals(test.withInfo(TRADE_INFO).getInfo(), TRADE_INFO);

modules/product/src/test/java/com/opengamma/strata/product/fxopt/FxVanillaOptionTradeTest.java

@@ -41,7 +41,7 @@ public class FxVanillaOptionTradeTest {
   public void test_builder() {
     FxVanillaOptionTrade test = sut();
     assertEquals(test.getProduct(), PRODUCT);
-    assertEquals(test.getCurrencyPair(), PRODUCT.getCurrencyPair());
+    assertEquals(test.getProduct().getCurrencyPair(), PRODUCT.getCurrencyPair());
     assertEquals(test.getInfo(), TRADE_INFO);
     assertEquals(test.getPremium(), PREMIUM);
     assertEquals(test.withInfo(TRADE_INFO).getInfo(), TRADE_INFO);