* Fix QueueUnbindAsync default argument in IChannel

* Rename variables in test to make it easier to understand

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -912,7 +912,7 @@ virtual RabbitMQ.Client.TcpClientAdapter.ReceiveTimeout.set -> void
 ~RabbitMQ.Client.IChannel.QueueDeclarePassiveAsync(string queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.QueueDeclareOk>
 ~RabbitMQ.Client.IChannel.QueueDeleteAsync(string queue, bool ifUnused, bool ifEmpty, bool noWait = false, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<uint>
 ~RabbitMQ.Client.IChannel.QueuePurgeAsync(string queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<uint>
-~RabbitMQ.Client.IChannel.QueueUnbindAsync(string queue, string exchange, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
+~RabbitMQ.Client.IChannel.QueueUnbindAsync(string queue, string exchange, string routingKey, System.Collections.Generic.IDictionary<string, object> arguments = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
 ~RabbitMQ.Client.IChannel.TxCommitAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
 ~RabbitMQ.Client.IChannel.TxRollbackAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task
 ~RabbitMQ.Client.IChannel.TxSelectAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task

projects/RabbitMQ.Client/client/api/IChannel.cs

@@ -418,7 +418,7 @@ Task QueueBindAsync(string queue, string exchange, string routingKey,
         /// Routing key must be shorter than 255 bytes.
         /// </remarks>
         Task QueueUnbindAsync(string queue, string exchange, string routingKey,
-            IDictionary<string, object> arguments,
+            IDictionary<string, object> arguments = null,
             CancellationToken cancellationToken = default);
 
         /// <summary>

projects/Test/Integration/ConnectionRecovery/TestRecoveryWithDeletedEntities.cs

@@ -97,26 +97,26 @@ public async Task TestThatDeletedExchangesDontReappearOnRecovery()
         public async Task TestThatDeletedQueueBindingsDontReappearOnRecovery()
         {
             string q = (await _channel.QueueDeclareAsync("", false, false, false)).QueueName;
-            string x1 = "amq.fanout";
-            string x2 = GenerateExchangeName();
+            string ex_amq_fanout = "amq.fanout";
+            string ex_test = GenerateExchangeName();
 
-            await _channel.ExchangeDeclareAsync(x2, "fanout");
-            await _channel.ExchangeBindAsync(x1, x2, "");
-            await _channel.QueueBindAsync(q, x1, "");
-            await _channel.QueueUnbindAsync(q, x1, "", null);
+            await _channel.ExchangeDeclareAsync(ex_test, "fanout");
+            await _channel.ExchangeBindAsync(destination: ex_amq_fanout, source: ex_test, routingKey: "");
+            await _channel.QueueBindAsync(q, ex_amq_fanout, "");
+            await _channel.QueueUnbindAsync(q, ex_amq_fanout, "");
 
             try
             {
                 await CloseAndWaitForRecoveryAsync();
                 Assert.True(_channel.IsOpen);
-                await _channel.BasicPublishAsync(x2, "", _encoding.GetBytes("msg"));
+                await _channel.BasicPublishAsync(ex_test, "", _encoding.GetBytes("msg"));
                 await AssertMessageCountAsync(q, 0);
             }
             finally
             {
                 await WithTemporaryChannelAsync(async ch =>
                 {
-                    await ch.ExchangeDeleteAsync(x2);
+                    await ch.ExchangeDeleteAsync(ex_test);
                     await ch.QueueDeleteAsync(q);
                 });
             }