Skip to content

Merge .NET6 WIP to Feature branch #1018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fassadlr merged 11 commits into from
Jul 11, 2022
Merged

Merge .NET6 WIP to Feature branch #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
864be32
Removed unused external lib folder
SatyaKarki Dec 2, 2021
c72b66d
Merge branch 'stratisproject:release/1.2.0.0' into release/1.2.0.0
SatyaKarki Dec 3, 2021
6c38bae
revert back external lib
SatyaKarki Dec 6, 2021
15656c2
Merge branch 'stratisproject:release/1.2.0.0' into release/1.2.0.0
SatyaKarki Dec 12, 2021
a2f100a
upgrade to .NET 6
SatyaKarki Dec 22, 2021
ef17cf2
Fixed Issue of POA IntegrationTests and Patricia Test
SatyaKarki Dec 27, 2021
8ffc8a5
Shorten long test name
SatyaKarki Dec 29, 2021
96a9458
Increase confirmation window (#1013)
quantumagi Jul 1, 2022
7af935d
Merge remote-tracking branch 'origin/release/1.3.0.0' into release/1.…
fassadlr Jul 11, 2022
4502cc6
Merge remote-tracking branch 'upstream/release/1.3.1.0' into release/…
fassadlr Jul 11, 2022
a145de7
Merge remote-tracking branch 'upstream/release/1.3.2.0' into release/…
fassadlr Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FodyNlogAdapter/FodyNlogAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>FodyNlogAdapter</AssemblyName>
<Version>1.3.2.0</Version>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
Expand Down
2 changes: 1 addition & 1 deletion src/NBitcoin.Tests/NBitcoin.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NBitcoin/NBitcoin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>NBitcoin</RootNamespace>
<PackageId>NStratis</PackageId>
<Authors>NStratis</Authors>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Benchmark/Stratis.Benchmark.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Api.Tests/Stratis.Bitcoin.Api.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Api.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Api.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Api/Stratis.Bitcoin.Features.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<AssemblyName>Stratis.Bitcoin.Features.Api</AssemblyName>
<OutputType>Library</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion ...tratis.Bitcoin.Features.BlockStore.Tests/Stratis.Bitcoin.Features.BlockStore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.BlockStore.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.BlockStore.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.BlockStore/Stratis.Bitcoin.Features.BlockStore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features BlockStore</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.BlockStore</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.BlockStore</AssemblyName>
<PackageId>Stratis.Features.BlockStore</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
3 changes: 2 additions & 1 deletion src/Stratis.Bitcoin.Features.ColdStaking.Tests/ColdStakingControllerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,9 +1082,10 @@ public void ColdStakingWithdrawalToColdWalletAccountThrowsWalletException()

/// <summary>
/// Confirms that trying to withdraw money from a non-existent cold staking account will raise an error.
/// ColdStakingWithdrawalFromNonExistingColdWalletAccountThrowsWalletException
/// </summary>
[Fact]
public void ColdStakingWithdrawalFromNonExistingColdWalletAccountThrowsWalletException()
public void ColdStakingWithdrawalFromNonExistingColdWallet()
{
this.Initialize();
this.CreateMempoolManager();
Expand Down
2 changes: 1 addition & 1 deletion ...atis.Bitcoin.Features.ColdStaking.Tests/Stratis.Bitcoin.Features.ColdStaking.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.ColdStaking.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.ColdStaking.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.ColdStaking/Stratis.Bitcoin.Features.ColdStaking.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.ColdStaking</AssemblyName>
<PackageId>Stratis.Features.ColdStaking</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Consensus.Tests/Stratis.Bitcoin.Features.Consensus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Consensus.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.Consensus.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Consensus/Stratis.Bitcoin.Features.Consensus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features Consensus</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.Consensus</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Consensus</AssemblyName>
<PackageId>Stratis.Features.Consensus</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Dns.Tests/Stratis.Bitcoin.Features.Dns.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Dns.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.Dns.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Dns/Stratis.Bitcoin.Features.Dns.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features Dns</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.Dns</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Dns</AssemblyName>
<PackageId>Stratis.Features.Dns</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.LightWallet/Stratis.Bitcoin.Features.LightWallet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.LightWallet</AssemblyName>
<PackageId>Stratis.Features.LightWallet</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand Down
2 changes: 1 addition & 1 deletion ...tratis.Bitcoin.Features.MemoryPool.Tests/Stratis.Bitcoin.Features.MemoryPool.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.MemoryPool.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.MemoryPool.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.MemoryPool/Stratis.Bitcoin.Features.MemoryPool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features MemoryPool</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.MemoryPool</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.MemoryPool</AssemblyName>
<PackageId>Stratis.Features.MemoryPool</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Miner.Tests/Stratis.Bitcoin.Features.Miner.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<IsPackable>false</IsPackable>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Miner.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.Miner.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Miner/Stratis.Bitcoin.Features.Miner.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features Miner</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.Miner</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Miner</AssemblyName>
<PackageId>Stratis.Features.Miner</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion ....Bitcoin.Features.Notifications.Tests/Stratis.Bitcoin.Features.Notifications.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Notifications.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.Notifications.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Notifications/Stratis.Bitcoin.Features.Notifications.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features Notifications</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.Notifications</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Notifications</AssemblyName>
<PackageId>Stratis.Features.Notifications</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion ...s.PoA.IntegrationTests.Common/Stratis.Bitcoin.Features.PoA.IntegrationTests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<AssemblyName>Stratis.Bitcoin.Features.PoA.IntegrationTests.Common</AssemblyName>
<PackageId>Stratis.Features.PoA.IntegrationTests.Common</PackageId>
Expand Down
8 changes: 4 additions & 4 deletions ...itcoin.Features.PoA.IntegrationTests/Stratis.Bitcoin.Features.PoA.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>

<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.PoA.Tests/Stratis.Bitcoin.Features.PoA.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.PoA/Stratis.Bitcoin.Features.PoA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features PoA</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.PoA</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.PoA</AssemblyName>
<PackageId>Stratis.Features.PoA</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.RPC.Tests/Stratis.Bitcoin.Features.RPC.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.RPC.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.RPC.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.RPC/Stratis.Bitcoin.Features.RPC.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features RPC</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.RPC</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.RPC</AssemblyName>
<PackageId>Stratis.Features.RPC</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion ...itcoin.Features.SmartContracts.Tests/Stratis.Bitcoin.Features.SmartContracts.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.SmartContracts.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.SmartContracts.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Wallet.Tests/Stratis.Bitcoin.Features.Wallet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Wallet.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.Wallet.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
21 changes: 15 additions & 6 deletions src/Stratis.Bitcoin.Features.Wallet.Tests/WalletTransactionHandlerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,11 @@ public void FundTransaction_Given__a_wallet_has_enough_inputs__When__adding_inpu
Assert.Contains(fundTransaction.Outputs, a => a.ScriptPubKey == destinationKeys3.PubKey.ScriptPubKey);
}

/// <summary>
/// Given_AnInvalidAccountIsUsed_When_GetMaximumSpendableAmountIsCalled_Then_AnExceptionIsThrown
/// </summary>
[Fact]
public void Given_AnInvalidAccountIsUsed_When_GetMaximumSpendableAmountIsCalled_Then_AnExceptionIsThrown()
public void WalletInvalidAccountTest()
{
DataFolder dataFolder = CreateDataFolder(this);

Expand Down Expand Up @@ -419,7 +422,7 @@ public void WalletMaxSpendableTest3()
HdAddress accountAddress2 = account.InternalAddresses.First();
accountAddress2.Transactions.Add(WalletTestsHelpers.CreateTransaction(new uint256(3), new Money(20000), 3, new SpendingDetails()));
accountAddress2.Transactions.Add(WalletTestsHelpers.CreateTransaction(new uint256(4), new Money(120000), 4, new SpendingDetails()));

(Money max, Money fee) result = walletTransactionHandler.GetMaximumSpendableAmount(new WalletAccountReference("wallet1", "account 1"), FeeType.Low, true);
Assert.Equal(Money.Zero, result.max);
Assert.Equal(Money.Zero, result.fee);
Expand Down Expand Up @@ -490,7 +493,7 @@ public void WalletMaxSpendableTest1()
var reserveUtxoService = new ReserveUtxoService(this.loggerFactory, new Mock<ISignals>().Object);

var walletTransactionHandler = new WalletTransactionHandler(this.LoggerFactory.Object, walletManager, walletFeePolicy.Object, this.Network, this.standardTransactionPolicy, reserveUtxoService);

(Wallet wallet, ExtKey extKey) = WalletTestsHelpers.GenerateBlankWalletWithExtKey("wallet1", "password", walletRepository);

// Passing a null extpubkey into account creation causes problems later, so we need to obtain it first
Expand All @@ -507,7 +510,7 @@ public void WalletMaxSpendableTest1()
HdAddress accountAddress2 = account.InternalAddresses.Skip(1).First();
accountAddress2.Transactions.Add(WalletTestsHelpers.CreateTransaction(new uint256(3), new Money(20000), null, null, null, accountAddress2.ScriptPubKey));
accountAddress2.Transactions.Add(WalletTestsHelpers.CreateTransaction(new uint256(4), new Money(120000), null, null, null, accountAddress2.ScriptPubKey));

(Money max, Money fee) result = walletTransactionHandler.GetMaximumSpendableAmount(new WalletAccountReference("wallet1", "account 1"), FeeType.Low, true);
Assert.Equal(new Money(165000), result.max + result.fee);
}
Expand Down Expand Up @@ -698,8 +701,11 @@ public void When_BuildTransactionIsCalled_Then_FeeIsDeductedFromAmountsInTransac
Assert.True(transaction.Outputs.Count(i => i.Value.Satoshi < 5_000_000_000) == 2); // 2 outputs should have fees taken from the amount
}

/// <summary>
/// When_BuildTransactionIsCalledWithoutTransactionFee_Then_FeeIsDeductedFromSingleOutputInTransaction
/// </summary>
[Fact]
public void When_BuildTransactionIsCalledWithoutTransactionFee_Then_FeeIsDeductedFromSingleOutputInTransaction()
public void BuildTransactionWithoutTransactionFeeTest1()
{
DataFolder dataFolder = CreateDataFolder(this);

Expand Down Expand Up @@ -766,8 +772,11 @@ public void When_BuildTransactionIsCalledWithoutTransactionFee_Then_FeeIsDeducte
Assert.True(transaction.Outputs.Count(i => i.Value.Satoshi < 5_000_000_000) == 1); // 1 output should have fees taken from the amount
}

/// <summary>
/// When_BuildTransactionIsCalledWithoutTransactionFee_Then_MultipleSubtractFeeRecipients_ThrowsException
/// </summary>
[Fact]
public void When_BuildTransactionIsCalledWithoutTransactionFee_Then_MultipleSubtractFeeRecipients_ThrowsException()
public void BuildTransactionWithoutTransactionFeeTest2()
{
DataFolder dataFolder = CreateDataFolder(this);

Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.Wallet/Stratis.Bitcoin.Features.Wallet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features Wallet</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.Wallet</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.Wallet</AssemblyName>
<PackageId>Stratis.Features.Wallet</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion ...coin.Features.WatchOnlyWallet.Tests/Stratis.Bitcoin.Features.WatchOnlyWallet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.WatchOnlyWallet.Tests</AssemblyName>
<PackageId>Stratis.Bitcoin.Features.WatchOnlyWallet.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.Features.WatchOnlyWallet/Stratis.Bitcoin.Features.WatchOnlyWallet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Stratis Bitcoin Features WatchOnlyWallet</Description>
<AssemblyTitle>Stratis.Bitcoin.Features.WatchOnlyWallet</AssemblyTitle>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<AssemblyName>Stratis.Bitcoin.Features.WatchOnlyWallet</AssemblyName>
<PackageId>Stratis.Features.WatchOnlyWallet</PackageId>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.IntegrationTests.Common/Stratis.Bitcoin.IntegrationTests.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>

<AssemblyName>Stratis.Bitcoin.IntegrationTests.Common</AssemblyName>
<PackageId>Stratis.Features.IntegrationTests.Common</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion src/Stratis.Bitcoin.IntegrationTests/API/ApiSpecification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void Proof_of_work_node_calls_getstakinginfo_and_receives_error()
}

[Fact]
public void Proof_of_stake_node_calls_generate_after_last_Pow_block_and_receives_error()
public void PoS_node_calls_generate_after_last_Pow_block_and_receives_error()
{
Given(a_proof_of_stake_node_with_api_enabled);
And(the_proof_of_stake_node_has_passed_LastPOWBlock);
Expand Down
Loading