Remove accidentally duped channel error enum

Author: camelpunch

RMQClient/RMQAllocatedChannel.m

@@ -365,7 +365,7 @@ - (RMQQueue *)memoizedQueueDeclare:(NSString *)originalQueueName options:(RMQQue
 
     if (self.queues[declaredQueueName]) {
         NSError *error = [NSError errorWithDomain:RMQErrorDomain
-                                             code:RMQChannelErrorQueueNameCollision
+                                             code:RMQErrorChannelQueueNameCollision
                                          userInfo:@{NSLocalizedDescriptionKey: @"Name collision when generating unique name."}];
         [self.delegate channel:self error:error];
         return nil;

RMQClient/RMQChannel.h

@@ -4,13 +4,6 @@
 #import "RMQFrameHandler.h"
 #import "RMQQueue.h"
 
-typedef NS_ENUM(NSInteger, RMQChannelError) {
-    RMQChannelErrorUnallocated = 1,
-    RMQChannelErrorWaitTimeout,
-    RMQChannelErrorIncorrectSyncMethod,
-    RMQChannelErrorQueueNameCollision,
-};
-
 @protocol RMQConnectionDelegate;
 
 @protocol RMQChannel <NSObject, RMQFrameHandler>

RMQClient/RMQFramesetSemaphoreWaiter.m

@@ -31,13 +31,13 @@ - (RMQFramesetWaitResult *)waitOn:(Class)methodClass {
     if (dispatch_semaphore_wait(self.semaphore, self.syncTimeoutFromNow) != 0) {
         NSString *msg = [NSString stringWithFormat:@"Timed out waiting for %@.", methodClass];
         NSError *error = [NSError errorWithDomain:RMQErrorDomain
-                                             code:RMQChannelErrorWaitTimeout
+                                             code:RMQErrorChannelWaitTimeout
                                          userInfo:@{NSLocalizedDescriptionKey: msg}];
         result = [[RMQFramesetWaitResult alloc] initWithFrameset:nil error:error];
     } else if (![self.lastFrameset.method isKindOfClass:methodClass]) {
         NSString *msg = [NSString stringWithFormat:@"Expected %@, got %@.", methodClass, [self.lastFrameset.method class]];
         NSError *error = [NSError errorWithDomain:RMQErrorDomain
-                                             code:RMQChannelErrorIncorrectSyncMethod
+                                             code:RMQErrorChannelIncorrectSyncMethod
                                          userInfo:@{NSLocalizedDescriptionKey: msg}];
         result = [[RMQFramesetWaitResult alloc] initWithFrameset:self.lastFrameset error:error];
     } else {

RMQClient/RMQUnallocatedChannel.m

@@ -27,7 +27,7 @@ - (void)blockingWaitOn:(Class)method {}
 - (void)basicConsume:(NSString *)queueName
              options:(RMQBasicConsumeOptions)options
             consumer:(RMQConsumer)consumer {
-    NSError *error = [NSError errorWithDomain:RMQErrorDomain code:RMQChannelErrorUnallocated userInfo:@{NSLocalizedDescriptionKey: @"Unallocated channel"}];
+    NSError *error = [NSError errorWithDomain:RMQErrorDomain code:RMQErrorChannelUnallocated userInfo:@{NSLocalizedDescriptionKey: @"Unallocated channel"}];
     [self.delegate channel:self error:error];
 }
 

RMQClientTests/RMQFramesetSemaphoreWaiterTest.swift

@@ -7,7 +7,7 @@ class RMQFramesetSemaphoreWaiterTest: XCTestCase {
         let result = waiter.waitOn(RMQChannelOpenOk.self)
 
         XCTAssertNil(result.frameset)
-        XCTAssertEqual(RMQChannelError.WaitTimeout.rawValue, result.error.code)
+        XCTAssertEqual(RMQError.ChannelWaitTimeout.rawValue, result.error.code)
         XCTAssertEqual("Timed out waiting for RMQChannelOpenOk.", result.error.localizedDescription)
     }
 
@@ -21,7 +21,7 @@ class RMQFramesetSemaphoreWaiterTest: XCTestCase {
         let result = waiter.waitOn(RMQChannelOpenOk.self)
 
         XCTAssertEqual(deliveredFrameset, result.frameset)
-        XCTAssertEqual(RMQChannelError.IncorrectSyncMethod.rawValue, result.error.code)
+        XCTAssertEqual(RMQError.ChannelIncorrectSyncMethod.rawValue, result.error.code)
         XCTAssertEqual("Expected RMQChannelOpenOk, got RMQBasicConsumeOk.", result.error.localizedDescription)
     }
 

RMQClientTests/RMQUnallocatedChannelTest.swift

@@ -7,7 +7,7 @@ class RMQUnallocatedChannelTest: XCTestCase {
         let ch = RMQUnallocatedChannel()
         ch.activateWithDelegate(delegate)
         ch.basicConsume("foo", options: []) { (_) in }
-        XCTAssertEqual(RMQChannelError.Unallocated.rawValue, delegate.lastChannelError?.code)
+        XCTAssertEqual(RMQError.ChannelUnallocated.rawValue, delegate.lastChannelError?.code)
         XCTAssertEqual("Unallocated channel", delegate.lastChannelError!.localizedDescription)
     }