Shorter type names for all enumerations

SwiftyStoreDemo/ViewController.swift

@@ -119,7 +119,7 @@ extension ViewController {
         }
     }
 
-    func alertForProductRetrievalInfo(result: SwiftyStoreKit.RetrieveResultType) -> UIAlertController {
+    func alertForProductRetrievalInfo(result: SwiftyStoreKit.RetrieveResult) -> UIAlertController {
         
         switch result {
         case .Success(let product):
@@ -130,7 +130,7 @@ extension ViewController {
         }
     }
 
-    func alertForPurchaseResult(result: SwiftyStoreKit.PurchaseResultType) -> UIAlertController {
+    func alertForPurchaseResult(result: SwiftyStoreKit.PurchaseResult) -> UIAlertController {
         switch result {
         case .Success(let productId):
             print("Purchase Success: \(productId)")
@@ -154,7 +154,7 @@ extension ViewController {
         }
     }
     
-    func alertForRestorePurchases(result: SwiftyStoreKit.RestoreResultType) -> UIAlertController {
+    func alertForRestorePurchases(result: SwiftyStoreKit.RestoreResult) -> UIAlertController {
         
         switch result {
         case .Success(let productId):
@@ -170,7 +170,7 @@ extension ViewController {
     }
 
 
-    func alertForVerifyReceipt(result: SwiftyStoreKit.VerifyReceiptResultType) -> UIAlertController{
+    func alertForVerifyReceipt(result: SwiftyStoreKit.VerifyReceiptResult) -> UIAlertController{
 
         switch result {
         case .Success(let receipt):
@@ -188,7 +188,7 @@ extension ViewController {
 
     }
 
-    func alertForRefreshReceipt(result: SwiftyStoreKit.RefreshReceiptResultType) -> UIAlertController {
+    func alertForRefreshReceipt(result: SwiftyStoreKit.RefreshReceiptResult) -> UIAlertController {
         switch result {
         case .Success:
             print("Receipt refresh Success")

SwiftyStoreKit/InAppReceipt.swift

@@ -30,7 +30,7 @@ public typealias ReceiptInfo = [String: AnyObject]
 
 // MARK: - Enumeration
 extension SwiftyStoreKit {
-    public enum VerifyReceiptResultType {
+    public enum VerifyReceiptResult {
         case Success(receipt: ReceiptInfo)
         case Error(error: ReceiptError)
     }
@@ -169,7 +169,7 @@ internal class InAppReceipt {
         receiptVerifyURL url: ReceiptVerifyURL = .Test,
         password autoRenewPassword: String? = nil,
         session: NSURLSession = NSURLSession.sharedSession(),
-        completion:(result: SwiftyStoreKit.VerifyReceiptResultType) -> ()) {
+        completion:(result: SwiftyStoreKit.VerifyReceiptResult) -> ()) {
 
             // If no receipt is present, validation fails.
             guard let base64EncodedString = self.base64EncodedString else {

SwiftyStoreKit/SwiftyStoreKit.swift

@@ -45,25 +45,25 @@ public class SwiftyStoreKit {
     private var receiptRefreshRequest: InAppReceiptRefreshRequest?
     #endif
     // MARK: Enums
-    public enum PurchaseErrorType {
+    public enum PurchaseError {
         case Failed(error: ErrorType)
         case NoProductIdentifier
         case PaymentNotAllowed
     }
-    public enum PurchaseResultType {
+    public enum PurchaseResult {
         case Success(productId: String)
-        case Error(error: PurchaseErrorType)
+        case Error(error: PurchaseError)
     }
-    public enum RetrieveResultType {
+    public enum RetrieveResult {
         case Success(product: SKProduct)
         case Error(error: ErrorType)
     }
-    public enum RestoreResultType {
+    public enum RestoreResult {
         case Success(productId: String)
         case Error(error: ErrorType)
         case NothingToRestore
     }
-    public enum RefreshReceiptResultType {
+    public enum RefreshReceiptResult {
         case Success
         case Error(error: ErrorType)
     }
@@ -81,7 +81,7 @@ public class SwiftyStoreKit {
     }
     
     // MARK: Public methods
-    public class func retrieveProductInfo(productId: String, completion: (result: RetrieveResultType) -> ()) {
+    public class func retrieveProductInfo(productId: String, completion: (result: RetrieveResult) -> ()) {
         guard let product = sharedInstance.store.products[productId] else {
             
             sharedInstance.requestProduct(productId) { (inner: () throws -> SKProduct) -> () in
@@ -98,7 +98,7 @@ public class SwiftyStoreKit {
         completion(result: .Success(product: product))
     }
     
-    public class func purchaseProduct(productId: String, completion: (result: PurchaseResultType) -> ()) {
+    public class func purchaseProduct(productId: String, completion: (result: PurchaseResult) -> ()) {
         
         if let product = sharedInstance.store.products[productId] {
             sharedInstance.purchase(product: product, completion: completion)
@@ -115,7 +115,7 @@ public class SwiftyStoreKit {
         }
     }
     
-    public class func restorePurchases(completion: (result: RestoreResultType) -> ()) {
+    public class func restorePurchases(completion: (result: RestoreResult) -> ()) {
 
         sharedInstance.restoreRequest = InAppProductPurchaseRequest.restorePurchases() { result in
         
@@ -136,13 +136,13 @@ public class SwiftyStoreKit {
         receiptVerifyURL url: ReceiptVerifyURL = .Test,
         password: String? = nil,
         session: NSURLSession = NSURLSession.sharedSession(),
-        completion:(result: VerifyReceiptResultType) -> ()) {
+        completion:(result: VerifyReceiptResult) -> ()) {
             InAppReceipt.verify(receiptVerifyURL: url, password: password, session: session, completion: completion)
     }
 
     #if os(iOS) || os(tvOS)
     // After verifying receive and have `ReceiptError.NoReceiptData`, refresh receipt using this method
-    public class func refreshReceipt(receiptProperties: [String : AnyObject]? = nil, completion: (result: RefreshReceiptResultType) -> ()) {
+    public class func refreshReceipt(receiptProperties: [String : AnyObject]? = nil, completion: (result: RefreshReceiptResult) -> ()) {
         sharedInstance.receiptRefreshRequest = InAppReceiptRefreshRequest.refresh(receiptProperties) { result in
 
             sharedInstance.receiptRefreshRequest = nil
@@ -169,7 +169,7 @@ public class SwiftyStoreKit {
     #endif
 
     // MARK: private methods
-    private func purchase(product product: SKProduct, completion: (result: PurchaseResultType) -> ()) {
+    private func purchase(product product: SKProduct, completion: (result: PurchaseResult) -> ()) {
         guard SwiftyStoreKit.canMakePayments else {
             completion(result: .Error(error: .PaymentNotAllowed))
             return
@@ -189,7 +189,7 @@ public class SwiftyStoreKit {
         }
     }
 
-    private func processPurchaseResult(result: InAppProductPurchaseRequest.TransactionResult) -> PurchaseResultType {
+    private func processPurchaseResult(result: InAppProductPurchaseRequest.TransactionResult) -> PurchaseResult {
         switch result {
         case .Purchased(let productId):
             return .Success(productId: productId)
@@ -202,7 +202,7 @@ public class SwiftyStoreKit {
         }
     }
     
-    private func processRestoreResult(result: InAppProductPurchaseRequest.TransactionResult) -> RestoreResultType {
+    private func processRestoreResult(result: InAppProductPurchaseRequest.TransactionResult) -> RestoreResult {
         switch result {
         case .Purchased(let productId):
             return .Error(error: storeInternalError(code: InternalErrorCode.PurchasedWhenRestoringPurchase.rawValue, description: "Cannot purchase product \(productId) from restore purchases path"))

SwiftyStoreOSXDemo/ViewController.swift

@@ -104,7 +104,7 @@ extension ViewController {
         }
     }
 
-    func alertForProductRetrievalInfo(result: SwiftyStoreKit.RetrieveResultType) -> NSAlert {
+    func alertForProductRetrievalInfo(result: SwiftyStoreKit.RetrieveResult) -> NSAlert {
         
         switch result {
         case .Success(let product):
@@ -115,7 +115,7 @@ extension ViewController {
         }
     }
     
-    func alertForPurchaseResult(result: SwiftyStoreKit.PurchaseResultType) -> NSAlert {
+    func alertForPurchaseResult(result: SwiftyStoreKit.PurchaseResult) -> NSAlert {
 
         switch result {
         case .Success(let productId):
@@ -140,7 +140,7 @@ extension ViewController {
         }
     }
     
-    func alertForRestorePurchases(result: SwiftyStoreKit.RestoreResultType) -> NSAlert {
+    func alertForRestorePurchases(result: SwiftyStoreKit.RestoreResult) -> NSAlert {
         
         switch result {
         case .Success(let productId):
@@ -155,7 +155,7 @@ extension ViewController {
         }
     }
 
-    func alertForVerifyReceipt(result: SwiftyStoreKit.VerifyReceiptResultType) -> NSAlert {
+    func alertForVerifyReceipt(result: SwiftyStoreKit.VerifyReceiptResult) -> NSAlert {
 
         switch result {
         case .Success(let receipt):