Skip to content
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

Jump to bottom

Fix segwit to resolve segwit CI errors #1132

Draft
wants to merge 2 commits into
base: release/1.4.0.7
Choose a base branch
from
Draft

Fix segwit to resolve segwit CI errors #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eaa937
Fix segwit to resolve segwit CI errors
quantumagi Mar 28, 2023
d5f9cc6
Remove unintended change
quantumagi Mar 28, 2023
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
8 changes: 8 additions & 0 deletions src/Stratis.Bitcoin.IntegrationTests/SegWitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
using Stratis.Bitcoin.P2P.Protocol.Payloads;
using Stratis.Bitcoin.Tests.Common;
using Stratis.Bitcoin.Utilities.Extensions;
using Stratis.Bitcoin.Utilities.JsonErrors;
using Xunit;

namespace Stratis.Bitcoin.IntegrationTests
Expand Down Expand Up @@ -713,8 +714,15 @@ public void SegwitWalletTransactionBuildingTest_SpendP2WPKHAndNormalUTXOs()
FeeAmount = Money.Coins(0.001m).ToString()
}).GetAwaiter().GetResult();

if (transactionResult is ErrorResult errorResult && errorResult.Value is ErrorResponse errorResponse)
{
Assert.False(true, errorResponse.Errors.First().Message);
}

walletBuildTransactionModel = (WalletBuildTransactionModel)(transactionResult as JsonResult)?.Value;

Assert.NotNull(walletBuildTransactionModel);

_ = node.FullNode.NodeController<WalletController>().SendTransactionAsync(new SendTransactionRequest(walletBuildTransactionModel.Hex));

TestBase.WaitLoop(() => node.CreateRPCClient().GetRawMempool().Length > 0, cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(1)).Token);
Expand Down
9 changes: 1 addition & 8 deletions src/Stratis.Features.SQLiteWalletRepository/External/ITransactionsToLists.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,8 @@ internal IEnumerable<TxDestination> GetDestinations(Script redeemScript)
{
if (txDestination.ToBytes().Length == 20)
{
yield return PayToWitPubKeyHashTemplate.Instance.ExtractScriptPubKeyParameters(this.network, redeemScript);
yield return new KeyId(txDestination.ToBytes());
}
else if (txDestination.ToBytes().Length == 32)
{
yield return PayToWitScriptHashTemplate.Instance.ExtractScriptPubKeyParameters(this.network, redeemScript);
}

// This should not happen, segwit scripts should generally only have one of the two valid lengths.
yield return txDestination;
}
break;
default:
Expand Down