Fix flaky test

Author: NicolasDorier

NBitcoin.Tests/RPCClientTests.cs

@@ -1657,7 +1657,7 @@ public void ShouldWalletProcessPSBTAndExtractMempoolAcceptableTX()
 
 				var txResult = result.PSBT.ExtractTransaction();
 				var estimatedFeeRate = result.PSBT.GetEstimatedFeeRate();
-				var acceptResult = client.TestMempoolAccept(txResult, new TestMempoolParameters() { MaxFeeRate = new FeeRate(estimatedFeeRate.FeePerK + new Money(1)) });
+				var acceptResult = client.TestMempoolAccept(txResult, new TestMempoolParameters() { MaxFeeRate = new FeeRate(estimatedFeeRate.FeePerK + new Money(1UL)) });
 				Assert.True(acceptResult.IsAllowed, acceptResult.RejectReason);
 				acceptResult = client.TestMempoolAccept(txResult, new TestMempoolParameters() { MaxFeeRate = new FeeRate(estimatedFeeRate.FeePerK - Money.Satoshis(10)) });
 				Assert.False(acceptResult.IsAllowed, acceptResult.RejectReason);

NBitcoin.Tests/transaction_tests.cs

@@ -1135,40 +1135,41 @@ public void TransactionBuilderFeeRateSideCase()
 
 		[Fact]
 		[Trait("UnitTest", "UnitTest")]
-		public void TransactionBuilderRefundsFeeAfterMergingOutputs()
-		{
-			var sender = new Key().PubKey.GetScriptPubKey(ScriptPubKeyType.Segwit);
-			var destination = new Key();
-			var c1 = new Coin(new OutPoint(uint256.Zero, 0), new TxOut(Money.Coins(1.0m), sender));
-			var c2 = new Coin(new OutPoint(uint256.Zero, 1), new TxOut(Money.Coins(2.0m), sender));
-			var selector = new SpyCoinSelector();
-			selector.AddSelections(new[] { c1, c2 });
-			selector.AddSelections(new[] { c1 });
-
-			var feeRate = new FeeRate(5.0m);
-			var builder = Network.Main.CreateTransactionBuilder()
-				.AddCoins(c1, c2)
-				.SetCoinSelector(selector)
-				.Send(destination, Money.Coins(0.5m))
-				.SetChange(destination)
-				.SendEstimatedFees(feeRate);
-
-			var tx = builder.BuildTransaction(false);
-			var expectedFee = feeRate.GetFee(builder.EstimateSize(tx, true));
-
-			Assert.Single(tx.Outputs);
-			Assert.Equal(expectedFee, tx.GetFee(builder.FindSpentCoins(tx)));
-			Assert.Equal(c1.Amount - expectedFee, tx.Outputs[0].Value);
-		}
-
-		[Fact]
-		[Trait("UnitTest", "UnitTest")]
+		public void TransactionBuilderRefundsFeeAfterMergingOutputs()
+		{
+			var sender = new Key().PubKey.GetScriptPubKey(ScriptPubKeyType.Segwit);
+			var destination = new Key();
+			var c1 = new Coin(new OutPoint(uint256.Zero, 0), new TxOut(Money.Coins(1.0m), sender));
+			var c2 = new Coin(new OutPoint(uint256.Zero, 1), new TxOut(Money.Coins(2.0m), sender));
+			var selector = new SpyCoinSelector();
+			selector.AddSelections(new[] { c1, c2 });
+			selector.AddSelections(new[] { c1 });
+
+			var feeRate = new FeeRate(5.0m);
+			var builder = Network.Main.CreateTransactionBuilder()
+				.AddCoins(c1, c2)
+				.SetCoinSelector(selector)
+				.Send(destination, Money.Coins(0.5m))
+				.SetChange(destination)
+				.SendEstimatedFees(feeRate);
+
+			var tx = builder.BuildTransaction(false);
+			var expectedFee = feeRate.GetFee(builder.EstimateSize(tx, true));
+
+			Assert.Single(tx.Outputs);
+			Assert.Equal(expectedFee, tx.GetFee(builder.FindSpentCoins(tx)));
+			Assert.Equal(c1.Amount - expectedFee, tx.Outputs[0].Value);
+		}
+
+		[Fact]
+		[Trait("UnitTest", "UnitTest")]
 		public void TransactionBuilderFuzzying()
 		{
 			var seed = RandomUtils.GetInt32();
 			log.WriteLine("Seed " + seed);
 			TransactionBuilderFuzzyingCore(seed);
 			TransactionBuilderFuzzyingCore(659623968);
+			TransactionBuilderFuzzyingCore(503175992);
 		}
 
 		private void TransactionBuilderFuzzyingCore(int seed)
@@ -1250,10 +1251,18 @@ private void TransactionBuilderFuzzyingCore(int seed)
 				{
 					var tx = builder.BuildTransaction(false);
 					var actualFee = tx.GetFee(builder.FindSpentCoins(tx));
-					if (fee != null)
-					{
-						Assert.Equal(fee, actualFee);
-					}
+					if (fee != null)
+					{
+						if (tx.Outputs.Any(o => o.ScriptPubKey == carolScript))
+						{
+							Assert.Equal(fee, actualFee);
+						}
+						// It is possible that no change was calculated, and thus the actual fee ends up more than expected
+						else
+						{
+							Assert.True(fee <= actualFee);
+						}
+					}
 					if (feeRate != null)
 					{
 						var actualFeeRate = new FeeRate(actualFee, builder.EstimateSize(tx, true));
@@ -2286,8 +2295,8 @@ public void AssertCanSendBackSmallSegwitChange(PSBTVersion version)
 		// Because it would be above 100K, this would fail to pass policy rules of bitcoin.
 		// This test check that if this is the case, the transaction builder is correctly excluding
 		// small inputs from the selection in an attempt to keep transaction small.
-		public void DoNotBuildTooBigTransaction()
-		{
+		public void DoNotBuildTooBigTransaction()
+		{
 			var k = new Key();
 			var addr = k.PubKey.GetAddress(ScriptPubKeyType.Segwit, Network.Main);
 			int coinsCount = 5000;
@@ -2313,28 +2322,28 @@ public void DoNotBuildTooBigTransaction()
 			var rate = tx.GetFeeRate(builder.FindSpentCoins(tx));
 			// We can overshoot slightly, never undershoot
 			Assert.True(new FeeRate(1.0m).SatoshiPerByte <= rate.SatoshiPerByte);
-			Assert.Equal(new FeeRate(1.0m).SatoshiPerByte, rate.SatoshiPerByte, 1);
-		}
-
-		[Fact]
-		[Trait("UnitTest", "UnitTest")]
-		public void OversizedColoredTransactionThrowsNotEnoughFundsException()
-		{
-			var destination = new Key();
-			var asset = new AssetId(new Key());
-			var coins = Enumerable.Range(0, 5000)
-				.Select(i => new ColoredCoin(
-					new AssetMoney(asset, 1),
-					new Coin(new OutPoint(uint256.Zero, i), new TxOut(Money.Satoshis(1000), destination))))
-				.ToArray();
-			var builder = Network.Main.CreateTransactionBuilder()
-				.AddCoins(coins)
-				.SendAsset(destination, new AssetMoney(asset, coins.Length))
-				.SetChange(destination);
-
-			var exception = Assert.Throws<NotEnoughFundsException>(() => builder.BuildTransaction(false));
-			Assert.Contains("transaction's size would be too high", exception.Message);
-		}
+			Assert.Equal(new FeeRate(1.0m).SatoshiPerByte, rate.SatoshiPerByte, 1);
+		}
+
+		[Fact]
+		[Trait("UnitTest", "UnitTest")]
+		public void OversizedColoredTransactionThrowsNotEnoughFundsException()
+		{
+			var destination = new Key();
+			var asset = new AssetId(new Key());
+			var coins = Enumerable.Range(0, 5000)
+				.Select(i => new ColoredCoin(
+					new AssetMoney(asset, 1),
+					new Coin(new OutPoint(uint256.Zero, i), new TxOut(Money.Satoshis(1000), destination))))
+				.ToArray();
+			var builder = Network.Main.CreateTransactionBuilder()
+				.AddCoins(coins)
+				.SendAsset(destination, new AssetMoney(asset, coins.Length))
+				.SetChange(destination);
+
+			var exception = Assert.Throws<NotEnoughFundsException>(() => builder.BuildTransaction(false));
+			Assert.Contains("transaction's size would be too high", exception.Message);
+		}
 
 		[Theory]
 		[InlineData(PSBTVersion.PSBTv0)]
@@ -3449,8 +3458,8 @@ public void CanCacheHashes()
 
 		[Fact]
 		[Trait("UnitTest", "UnitTest")]
-		public void CheckScriptCoinIsCoherent()
-		{
+		public void CheckScriptCoinIsCoherent()
+		{
 			Key key = new Key();
 			var c = RandomCoin(Money.Zero, key.PubKey.ScriptPubKey.Hash);
 
@@ -3482,23 +3491,23 @@ public void CheckScriptCoinIsCoherent()
 			Assert.True(scriptCoin.GetHashVersion() == HashVersion.WitnessV0);
 
 
-			Assert.Throws<ArgumentException>(() => new ScriptCoin(c, key.PubKey.ScriptPubKey.WitHash.ScriptPubKey));
-		}
-
-		[Fact]
-		[Trait("UnitTest", "UnitTest")]
-		public void TransactionOutputHelpersRejectInvalidOutputReferences()
-		{
-			var previous = Network.CreateTransaction();
-			var output = previous.Outputs.Add(Money.Coins(1.0m), new Key());
-			var spending = Network.CreateTransaction();
-
-			Assert.Throws<InvalidOperationException>(() => spending.Inputs.Add(previous, -1));
-			Assert.Throws<ArgumentException>(() => new Coin(previous, output.Clone()));
-			Assert.Same(output, new Coin(previous, output).TxOut);
-		}
-
-		[Fact]
+			Assert.Throws<ArgumentException>(() => new ScriptCoin(c, key.PubKey.ScriptPubKey.WitHash.ScriptPubKey));
+		}
+
+		[Fact]
+		[Trait("UnitTest", "UnitTest")]
+		public void TransactionOutputHelpersRejectInvalidOutputReferences()
+		{
+			var previous = Network.CreateTransaction();
+			var output = previous.Outputs.Add(Money.Coins(1.0m), new Key());
+			var spending = Network.CreateTransaction();
+
+			Assert.Throws<InvalidOperationException>(() => spending.Inputs.Add(previous, -1));
+			Assert.Throws<ArgumentException>(() => new Coin(previous, output.Clone()));
+			Assert.Same(output, new Coin(previous, output).TxOut);
+		}
+
+		[Fact]
 		[Trait("UnitTest", "UnitTest")]
 		public void CheckWitnessSize()
 		{