Fixing name-spaces after the base re-factor

Breeze/src/Breeze.Api/Controllers/NodeController.cs

@@ -3,9 +3,8 @@ using System.ComponentModel.DataAnnotations;
 using Breeze.Api.Models;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
+using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
-using Stratis.Bitcoin.Notifications;
 
 namespace Breeze.Api.Controllers
 {	

Breeze/src/Breeze.Daemon/Program.cs

@@ -2,8 +2,6 @@
 using System.Linq;
 using System.Threading;
 using Breeze.Api;
-using Breeze.TumbleBit;
-using Microsoft.Extensions.Logging;
 using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Configuration;
@@ -11,14 +9,13 @@ using Stratis.Bitcoin.Logging;
 using Breeze.Wallet;
 using NBitcoin;
 using NBitcoin.Protocol;
-using Stratis.Bitcoin.BlockStore;
-using Stratis.Bitcoin.Consensus;
-using Stratis.Bitcoin.MemoryPool;
-using Stratis.Bitcoin.Miner;
-using Stratis.Bitcoin.Notifications;
+using Stratis.Bitcoin.Features.BlockStore;
+using Stratis.Bitcoin.Features.Consensus;
+using Stratis.Bitcoin.Features.MemoryPool;
+using Stratis.Bitcoin.Features.Miner;
+using Stratis.Bitcoin.Features.Notifications;
+using Stratis.Bitcoin.Features.Wallet;
 using Stratis.Bitcoin.Utilities;
-using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.WatchOnlyWallet;
 
 namespace Breeze.Daemon
 {

Breeze/src/Breeze.TumbleBit.Client/BlockObserver.cs

 using Breeze.TumbleBit.Client;
 using NBitcoin;
 using Stratis.Bitcoin;
+using Stratis.Bitcoin.Signals;
 
 namespace Breeze.TumbleBit
 {

Breeze/src/Breeze.TumbleBit.Client/ExternalServices.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using NBitcoin;
 using NTumbleBit;
-using Stratis.Bitcoin.MemoryPool;
+using Stratis.Bitcoin.Features.MemoryPool;
 
 namespace Breeze.TumbleBit.Client
 {

Breeze/src/Breeze.TumbleBit.Client/PaymentStateMachine.cs

@@ -10,8 +10,8 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using NBitcoin.SPV;
 using NTumbleBit;
-using Stratis.Bitcoin.Wallet;
-using Wallet = Stratis.Bitcoin.Wallet.Wallet;
+using Stratis.Bitcoin.Features.Wallet;
+using Wallet = Stratis.Bitcoin.Features.Wallet.Wallet;
 
 namespace Breeze.TumbleBit.Client
 {

Breeze/src/Breeze.TumbleBit.Client/TumbleBitFeature.cs

@@ -7,7 +7,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Stratis.Bitcoin.Builder;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using Stratis.Bitcoin.Wallet.JsonConverters;
+using Stratis.Bitcoin.Features.Wallet.JsonConverters;
 
 namespace Breeze.TumbleBit
 {

Breeze/src/Breeze.TumbleBit.Client/TumbleBitManager.cs

@@ -4,9 +4,9 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
 using NTumbleBit.ClassicTumbler;
-using Stratis.Bitcoin;
-using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.WatchOnlyWallet;
+using Stratis.Bitcoin.Features.Wallet;
+using Stratis.Bitcoin.Features.WatchOnlyWallet;
+using Stratis.Bitcoin.Signals;
 
 namespace Breeze.TumbleBit.Client
 {

Breeze/src/Breeze.TumbleBit.Client/TumblingState.cs

@@ -9,8 +9,8 @@ using Newtonsoft.Json;
 using NTumbleBit.ClassicTumbler;
 using NTumbleBit.PuzzlePromise;
 using NTumbleBit.PuzzleSolver;
-using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.WatchOnlyWallet;
+using Stratis.Bitcoin.Features.Wallet;
+using Stratis.Bitcoin.Features.WatchOnlyWallet;
 
 namespace Breeze.TumbleBit.Client
 {

Breeze/src/Breeze.Wallet/LightWalletFeature.cs

@@ -8,12 +8,11 @@ using NBitcoin.Protocol;
 using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Connection;
-using Stratis.Bitcoin.Consensus;
-using Stratis.Bitcoin.Consensus.Deployments;
 using Stratis.Bitcoin.Utilities;
-using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.Wallet.Controllers;
 using Stratis.Bitcoin.Common.Hosting;
+using Stratis.Bitcoin.Features.Consensus.Deployments;
+using Stratis.Bitcoin.Features.Wallet;
+using Stratis.Bitcoin.Features.Wallet.Controllers;
 
 namespace Breeze.Wallet
 {

Breeze/src/Breeze.Wallet/LightWalletSyncManager.cs

@@ -4,13 +4,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
-using NBitcoin.JsonConverters;
-using Stratis.Bitcoin;
-using Stratis.Bitcoin.Notifications;
 using Stratis.Bitcoin.Utilities;
-using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.Wallet.Notifications;
 using Stratis.Bitcoin.Common.Hosting;
+using Stratis.Bitcoin.Features.Notifications;
+using Stratis.Bitcoin.Features.Wallet;
+using Stratis.Bitcoin.Features.Wallet.Notifications;
+using Stratis.Bitcoin.Signals;
 
 namespace Breeze.Wallet
 {

Breeze/src/Breeze.Wallet/WalletFeePolicy.cs

 using System;
 using NBitcoin;
-using Stratis.Bitcoin.MemoryPool;
-using Stratis.Bitcoin.MemoryPool.Fee;
-using Stratis.Bitcoin.Wallet;
+using Stratis.Bitcoin.Features.MemoryPool;
+using Stratis.Bitcoin.Features.Wallet;
 
 namespace Breeze.Wallet
 {

StratisBitcoinFullNode @ c5d45c97

-Subproject commit 845f7b76ae524b544de6603b4fe4a94dcde85436
+Subproject commit c5d45c97df04e2b15bb26197de5c75dc39181690