this should fix the incorrectly wired derrivation component (#151)

jorijn · Feb 5, 2022 · b08bd8d · b08bd8d
1 parent 685cd8b
commit b08bd8d
Show file tree

Hide file tree

Showing 24 changed files with 542 additions and 678 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Client/BinanceClient.php b/src/Client/BinanceClient.php
@@ -22,6 +22,7 @@ class BinanceClient implements BinanceClientInterface
 {
     /** @var string */
     public const USER_AGENT = 'Mozilla/4.0 (compatible; Binance PHP client; Jorijn/BitcoinDca; '.PHP_OS.'; PHP/'.PHP_VERSION.')';
+
     /** @var string */
     public const HASH_ALGO = 'sha256';
 

diff --git a/src/EventListener/XPubAddressUsedListener.php b/src/EventListener/XPubAddressUsedListener.php
@@ -13,7 +13,7 @@
 
 namespace Jorijn\Bitcoin\Dca\EventListener;
 
-use Jorijn\Bitcoin\Dca\Component\AddressFromMasterPublicKeyComponent;
+use Jorijn\Bitcoin\Dca\Component\AddressFromMasterPublicKeyComponentInterface;
 use Jorijn\Bitcoin\Dca\Event\WithdrawSuccessEvent;
 use Jorijn\Bitcoin\Dca\Repository\TaggedIntegerRepositoryInterface;
 use Psr\Log\LoggerInterface;
@@ -23,7 +23,7 @@ class XPubAddressUsedListener
 {
     public function __construct(
         protected TaggedIntegerRepositoryInterface $taggedIntegerRepository,
-        protected AddressFromMasterPublicKeyComponent $addressFromMasterPublicKeyComponent,
+        protected AddressFromMasterPublicKeyComponentInterface $addressFromMasterPublicKeyComponent,
         protected LoggerInterface $logger,
         protected ?string $configuredXPub
     ) {

diff --git a/tests/Client/BinanceClientTest.php b/tests/Client/BinanceClientTest.php
@@ -31,6 +31,7 @@ final class BinanceClientTest extends TestCase
 {
     private string $apiKey;
     private string $apiSecret;
+
     /** @var HttpClientInterface|MockObject */
     private $httpClient;
     private BinanceClient $client;

diff --git a/tests/Client/BitvavoClientTest.php b/tests/Client/BitvavoClientTest.php
@@ -36,6 +36,7 @@ final class BitvavoClientTest extends TestCase
     private string $accessWindow;
     private string $apiKey;
     private string $apiSecret;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private BitvavoClient $client;

diff --git a/tests/Client/KrakenClientTest.php b/tests/Client/KrakenClientTest.php
@@ -32,6 +32,7 @@ final class KrakenClientTest extends TestCase
     private const BASE_URI = 'https://unit.test/';
 
     protected MockHttpClient $httpClient;
+
     /** @var LoggerInterface|MockObject */
     protected $logger;
     protected KrakenClient $client;

diff --git a/tests/Command/BuyCommandTest.php b/tests/Command/BuyCommandTest.php
@@ -38,6 +38,7 @@ final class BuyCommandTest extends TestCase
 
     /** @var BuyService|MockObject */
     private $buyService;
+
     /** @var MockObject|SerializerInterface */
     private $serializer;
 

diff --git a/tests/Command/VerifyXPubCommandTest.php b/tests/Command/VerifyXPubCommandTest.php
@@ -32,6 +32,7 @@ final class VerifyXPubCommandTest extends TestCase
 {
     /** @var AddressFromMasterPublicKeyComponent|MockObject */
     private $keyFactory;
+
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $xpubRepository;
     private string $configuredKey;

diff --git a/tests/EventListener/CheckForUpdatesListenerTest.php b/tests/EventListener/CheckForUpdatesListenerTest.php
@@ -42,6 +42,7 @@ final class CheckForUpdatesListenerTest extends TestCase
 
     /** @var InputInterface|MockObject */
     private $input;
+
     /** @var BufferedOutput */
     private $bufferedOutput;
 

diff --git a/tests/EventListener/IncreaseTaggedBalanceListenerTest.php b/tests/EventListener/IncreaseTaggedBalanceListenerTest.php
@@ -31,6 +31,7 @@ final class IncreaseTaggedBalanceListenerTest extends TestCase
 {
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $repository;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private IncreaseTaggedBalanceListener $listener;

diff --git a/tests/EventListener/Notifications/SendTelegramOnBuyListenerTest.php b/tests/EventListener/Notifications/SendTelegramOnBuyListenerTest.php
@@ -32,6 +32,7 @@ final class SendTelegramOnBuyListenerTest extends TestCase
 {
     /** @var HttpClientInterface|mixed|MockObject */
     private $httpClient;
+
     /** @var EventDispatcherInterface|mixed|MockObject */
     private $eventDispatcher;
     private TelegramTransport $transport;

diff --git a/tests/EventListener/Notifications/SendTelegramOnWithdrawListenerTest.php b/tests/EventListener/Notifications/SendTelegramOnWithdrawListenerTest.php
@@ -32,6 +32,7 @@ final class SendTelegramOnWithdrawListenerTest extends TestCase
 {
     /** @var HttpClientInterface|mixed|MockObject */
     private $httpClient;
+
     /** @var EventDispatcherInterface|mixed|MockObject */
     private $eventDispatcher;
     private TelegramTransport $transport;

diff --git a/tests/EventListener/Notifications/TesterOfAbstractSendEmailListener.php b/tests/EventListener/Notifications/TesterOfAbstractSendEmailListener.php
@@ -29,6 +29,7 @@ abstract class TesterOfAbstractSendEmailListener extends TestCase
 {
     /** @var MailerInterface|MockObject */
     protected $notifier;
+
     /** @var HtmlConverterInterface|MockObject */
     protected $htmlConverter;
     protected string $to;
@@ -40,6 +41,7 @@ abstract class TesterOfAbstractSendEmailListener extends TestCase
     protected string $iconLocation;
     protected NotificationEmailTemplateInformation $templateConfiguration;
     protected string $quotesLocation;
+
     /** @var AbstractSendEmailListener|MockObject */
     protected $listener;
     protected string $templateLocation;

diff --git a/tests/EventListener/ResetTaggedBalanceListenerTest.php b/tests/EventListener/ResetTaggedBalanceListenerTest.php
@@ -32,6 +32,7 @@ final class ResetTaggedBalanceListenerTest extends TestCase
 {
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $repository;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private ResetTaggedBalanceListener $listener;

diff --git a/tests/EventListener/WriteOrderToCsvListenerTest.php b/tests/EventListener/WriteOrderToCsvListenerTest.php
@@ -33,6 +33,7 @@
 final class WriteOrderToCsvListenerTest extends TestCase
 {
     private string $temporaryFile;
+
     /** @var MockObject|SerializerInterface */
     private $serializer;
     private WriteOrderToCsvListener $listener;

diff --git a/tests/EventListener/XPubAddressUsedListenerTest.php b/tests/EventListener/XPubAddressUsedListenerTest.php
@@ -14,7 +14,7 @@
 namespace Tests\Jorijn\Bitcoin\Dca\EventListener;
 
 use Exception;
-use Jorijn\Bitcoin\Dca\Component\AddressFromMasterPublicKeyComponent;
+use Jorijn\Bitcoin\Dca\Component\AddressFromMasterPublicKeyComponentInterface;
 use Jorijn\Bitcoin\Dca\Event\WithdrawSuccessEvent;
 use Jorijn\Bitcoin\Dca\EventListener\XPubAddressUsedListener;
 use Jorijn\Bitcoin\Dca\Model\CompletedWithdraw;
@@ -33,8 +33,10 @@ final class XPubAddressUsedListenerTest extends TestCase
 {
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $xpubRepository;
-    /** @var AddressFromMasterPublicKeyComponent|MockObject */
+
+    /** @var AddressFromMasterPublicKeyComponentInterface|MockObject */
     private $keyFactory;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private XPubAddressUsedListener $listener;
@@ -47,7 +49,7 @@ protected function setUp(): void
         parent::setUp();
 
         $this->xpubRepository = $this->createMock(TaggedIntegerRepositoryInterface::class);
-        $this->keyFactory = $this->createMock(AddressFromMasterPublicKeyComponent::class);
+        $this->keyFactory = $this->createMock(AddressFromMasterPublicKeyComponentInterface::class);
         $this->logger = $this->createMock(LoggerInterface::class);
         $this->configuredXPub = 'xpub'.random_int(1000, 2000);
         $this->listener = new XPubAddressUsedListener(

diff --git a/tests/Provider/XpubWithdrawAddressProviderTest.php b/tests/Provider/XpubWithdrawAddressProviderTest.php
@@ -30,8 +30,10 @@ final class XpubWithdrawAddressProviderTest extends TestCase
 {
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $xpubRepository;
+
     /** @var AddressFromMasterPublicKeyComponent|MockObject */
     private $keyFactory;
+
     /** @var MockObject|ValidationInterface */
     private $validation;
     private XpubWithdrawAddressProvider $provider;

diff --git a/tests/Service/Bitvavo/BitvavoWithdrawServiceTest.php b/tests/Service/Bitvavo/BitvavoWithdrawServiceTest.php
@@ -35,6 +35,7 @@ final class BitvavoWithdrawServiceTest extends TestCase
 
     /** @var BitvavoClientInterface|MockObject */
     private $client;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private BitvavoWithdrawService $service;

diff --git a/tests/Service/Bl3p/Bl3pBuyServiceTest.php b/tests/Service/Bl3p/Bl3pBuyServiceTest.php
@@ -38,6 +38,7 @@ final class Bl3pBuyServiceTest extends TestCase
     private const BTC = 'BTC';
     private const MONEY_ORDER_RESULT = '/money/order/result';
     private const MONEY_ORDER_ADD = '/money/order/add';
+
     /** @var Bl3pClientInterface|MockObject */
     private $client;
     private string $baseCurrency;

diff --git a/tests/Service/Bl3p/Bl3pWithdrawServiceTest.php b/tests/Service/Bl3p/Bl3pWithdrawServiceTest.php
@@ -34,6 +34,7 @@ final class Bl3pWithdrawServiceTest extends TestCase
 
     /** @var Bl3pClientInterface|MockObject */
     private $client;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private Bl3pWithdrawService $service;

diff --git a/tests/Service/BuyServiceTest.php b/tests/Service/BuyServiceTest.php
@@ -35,9 +35,11 @@ final class BuyServiceTest extends TestCase
 {
     /** @var EventDispatcherInterface|MockObject */
     private $dispatcher;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private string $configuredExchange;
+
     /** @var BuyServiceInterface|MockObject */
     private $supportedService;
     private int $timeout;

diff --git a/tests/Service/Kraken/KrakenWithdrawServiceTest.php b/tests/Service/Kraken/KrakenWithdrawServiceTest.php
@@ -31,6 +31,7 @@ final class KrakenWithdrawServiceTest extends TestCase
 {
     /** @var KrakenClientInterface|MockObject */
     private $client;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private string $withdrawKey;

diff --git a/tests/Service/WithdrawServiceTest.php b/tests/Service/WithdrawServiceTest.php
@@ -41,13 +41,17 @@ final class WithdrawServiceTest extends TestCase
 
     /** @var MockObject|WithdrawAddressProviderInterface */
     private $addressProvider;
+
     /** @var MockObject|WithdrawServiceInterface */
     private $supportedService;
+
     /** @var EventDispatcherInterface|MockObject */
     private $dispatcher;
+
     /** @var LoggerInterface|MockObject */
     private $logger;
     private string $configuredExchange;
+
     /** @var MockObject|TaggedIntegerRepositoryInterface */
     private $balanceRepository;