fixup

Author: lukebakken

projects/RabbitMQ.Client/client/impl/ChannelBase.cs

@@ -1402,7 +1402,7 @@ public async Task<QueueDeclareOk> QueueDeclareAsync(QueueName queue, bool durabl
         {
             if (true == noWait)
             {
-                if (queue == QueueName.Empty)
+                if (queue.IsEmpty)
                 {
                     throw new InvalidOperationException("noWait must not be used with a server-named queue.");
                 }

projects/RabbitMQ.Client/client/impl/ConsumerDispatching/ConsumerDispatcherChannelBase.cs

@@ -106,8 +106,8 @@ public ValueTask HandleBasicDeliverAsync(ulong deliveryTag, bool redelivered,
             if (false == _disposed && false == _quiesce)
             {
                 (IBasicConsumer consumer, _) = GetConsumerOrDefault(BasicDeliver.GetConsumerTag(method.Memory));
-                var work = WorkStruct.CreateDeliver(consumer, deliveryTag, redelivered, basicProperties, method, body);
-                return _writer.WriteAsync(work, cancellationToken);
+                WorkStruct basicDeliverWork = WorkStruct.CreateDeliver(consumer, deliveryTag, redelivered, basicProperties, method, body);
+                return _writer.WriteAsync(basicDeliverWork, cancellationToken);
             }
             else
             {

projects/RabbitMQ.Client/client/impl/RecordedConsumer.cs

@@ -106,11 +106,9 @@ public static RecordedConsumer WithNewQueueName(QueueName newQueueName, in Recor
             return new RecordedConsumer(old.Channel, old.Consumer, old.ConsumerTag, newQueueName, old.AutoAck, old.Exclusive, old.Arguments);
         }
 
-        public async Task<ConsumerTag> RecoverAsync(IChannel channel)
+        public Task<ConsumerTag> RecoverAsync(IChannel channel)
         {
-            string ct = await channel.BasicConsumeAsync(Queue, AutoAck, ConsumerTag, false, Exclusive, Arguments, Consumer)
-                .ConfigureAwait(false);
-            return new ConsumerTag(ct);
+            return channel.BasicConsumeAsync(Queue, AutoAck, ConsumerTag, false, Exclusive, Arguments, Consumer);
         }
     }
 }

projects/Test/Common/IntegrationFixture.cs

@@ -450,14 +450,16 @@ private string GenerateValidQueueOrExchangeName(string infix)
         {
             string name = $"{_testDisplayName}-{infix}-{Guid.NewGuid()}";
 
+            /*
+             * Note: only necessary if doing strict name validation
             if (name.Length > 127)
             {
                 name = name.Substring(0, 127);
             }
-
             name = name.Replace('(', '_');
             name = name.Replace(')', '_');
             name = name.Replace(' ', '_');
+            */
 
             return name;
         }