Provide default values to init

omgnetwork · May 23, 2018 · b384b45 · b384b45
1 parent eeb139a
commit b384b45
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/Source/Models/PaginationParams.swift b/Source/Models/PaginationParams.swift
@@ -66,7 +66,7 @@ public struct PaginationParams<T: Paginable> {
     ///   - sortDirection: The sort direction (ascending or descending)
     public init(page: Int,
                 perPage: Int,
-                searchTerm: String?,
+                searchTerm: String? = nil,
                 sortBy: T.SortableFields,
                 sortDirection: SortDirection) {
         self.init(page: page, perPage: perPage, searchTerm: searchTerm, searchTerms: nil, sortBy: sortBy, sortDirection: sortDirection)
@@ -82,7 +82,7 @@ public struct PaginationParams<T: Paginable> {
     ///   - sortDirection: The sort direction (ascending or descending)
     public init(page: Int,
                 perPage: Int,
-                searchTerms: [T.SearchableFields: Any]?,
+                searchTerms: [T.SearchableFields: Any]? = nil,
                 sortBy: T.SortableFields,
                 sortDirection: SortDirection) {
         self.init(page: page, perPage: perPage, searchTerm: nil, searchTerms: searchTerms, sortBy: sortBy, sortDirection: sortDirection)

diff --git a/Source/Models/TransactionConsumptionParams.swift b/Source/Models/TransactionConsumptionParams.swift
@@ -42,11 +42,11 @@ public struct TransactionConsumptionParams {
     ///   - correlationId: An id that can uniquely identify a transaction. Typically an order id from a provider.
     ///   - metadata: Additional metadata for the consumption
     public init?(transactionRequest: TransactionRequest,
-                 address: String?,
-                 tokenId: String?,
+                 address: String? = nil,
+                 tokenId: String? = nil,
                  amount: Double?,
                  idempotencyToken: String,
-                 correlationId: String?,
+                 correlationId: String? = nil,
                  metadata: [String: Any] = [:],
                  encryptedMetadata: [String: Any] = [:]) {
         guard transactionRequest.amount != nil || amount != nil else { return nil }

diff --git a/Source/Models/TransactionListParams.swift b/Source/Models/TransactionListParams.swift
@@ -20,7 +20,8 @@ public struct TransactionListParams {
     /// - Parameters:
     ///   - paginationParams: The params to use for the pagination
     ///   - address: An optional wallet address belonging to the current user
-    public init(paginationParams: PaginationParams<Transaction>, address: String?) {
+    public init(paginationParams: PaginationParams<Transaction>,
+                address: String? = nil) {
         self.paginationParams = paginationParams
         self.address = address
     }

diff --git a/Source/Models/TransactionRequestParams.swift b/Source/Models/TransactionRequestParams.swift
@@ -66,14 +66,14 @@ public struct TransactionRequestCreateParams {
     public init?(type: TransactionRequestType,
                  tokenId: String,
                  amount: Double?,
-                 address: String?,
-                 correlationId: String?,
+                 address: String? = nil,
+                 correlationId: String? = nil,
                  requireConfirmation: Bool,
-                 maxConsumptions: Int?,
-                 consumptionLifetime: Int?,
-                 expirationDate: Date?,
+                 maxConsumptions: Int? = nil,
+                 consumptionLifetime: Int? = nil,
+                 expirationDate: Date? = nil,
                  allowAmountOverride: Bool,
-                 maxConsumptionsPerUser: Int?,
+                 maxConsumptionsPerUser: Int? = nil,
                  metadata: [String: Any] = [:],
                  encryptedMetadata: [String: Any] = [:]) {
         guard allowAmountOverride || amount != nil else { return nil }