@@ -283,12 +283,11 @@ private void startFederate() throws Exception {
283283 );
284284
285285 directoryStorageInfo = new BtcToRskClientDirectoryStorageInfo (config );
286+ bitcoinWrapper = createAndSetupBitcoinWrapper ();
286287
288+ BtcToRskClientFileStorageFactory fileStorageFactory = new BtcToRskClientFileStorageFactory (directoryStorageInfo );
287289 BtcLockSenderProvider btcLockSenderProvider = new BtcLockSenderProvider ();
288290 PeginInstructionsProvider peginInstructionsProvider = new PeginInstructionsProvider ();
289- bitcoinWrapper = createAndSetupBitcoinWrapper (btcLockSenderProvider , peginInstructionsProvider );
290-
291- BtcToRskClientFileStorageFactory fileStorageFactory = new BtcToRskClientFileStorageFactory (directoryStorageInfo );
292291 BtcToRskClientFileStorage btcToRskActiveClientFileStorage = fileStorageFactory .forActive ();
293292 btcToRskClientActive .setup (
294293 bitcoinWrapper ,
@@ -338,8 +337,8 @@ private void startFederate() throws Exception {
338337 FederationWatcherListener federationWatcherListener = new FederationWatcherListenerImpl (
339338 btcToRskClientActive ,
340339 btcToRskClientRetiring ,
341- btcReleaseClient ,
342- bitcoinWrapper );
340+ btcReleaseClient
341+ );
343342
344343 federationWatcher .start (federationProvider , federationWatcherListener );
345344 }
@@ -384,22 +383,14 @@ public void stop() {
384383 logger .info ("[stop] Federation node Shut down." );
385384 }
386385
387- private BitcoinWrapper createAndSetupBitcoinWrapper (
388- BtcLockSenderProvider btcLockSenderProvider ,
389- PeginInstructionsProvider peginInstructionsProvider
390- ) throws UnknownHostException {
386+ private BitcoinWrapper createAndSetupBitcoinWrapper () throws UnknownHostException {
391387 final String BTC_TO_RSK_CLIENT_FILE_PREFIX = "BtcToRskClient" ;
392-
393388 Context btcContext = new Context (ThinConverter .toOriginalInstance (bridgeConstants .getBtcParamsString ()));
394389 File pegDirectory = new File (directoryStorageInfo .getPath ());
395390 Kit kit = new Kit (btcContext , pegDirectory , BTC_TO_RSK_CLIENT_FILE_PREFIX );
396391
397392 BitcoinWrapper wrapper = new BitcoinWrapperImpl (
398393 btcContext ,
399- bridgeConstants ,
400- btcLockSenderProvider ,
401- peginInstructionsProvider ,
402- federatorSupport ,
403394 kit
404395 );
405396 wrapper .setup (federatorSupport .getBitcoinPeerAddresses ());
0 commit comments