Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit db3fabf

Browse files
committed
Don’t require parameter names in init
1 parent 74ab7e4 commit db3fabf

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎Sources/Random.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ public class Random {
3333
// MARK: - Public Initializers
3434
//
3535

36-
public init(charSet: CharSet) {
36+
public init(_ charSet: CharSet) {
3737
self.charSet = charSet
3838
}
3939

4040
convenience public init() {
41-
self.init(charSet:CharSet.charSet32)
41+
self.init(CharSet.charSet32)
4242
}
4343

44-
convenience public init(chars: String) throws {
44+
convenience public init(_ chars: String) throws {
4545
let charSet = try CharSet(chars)
46-
self.init(charSet: charSet)
46+
self.init(charSet)
4747
}
4848

4949
public var chars: String {

‎Tests/EntropyStringTests/RandomTests.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ class RandomTests: XCTestCase {
2121
func testSessionID() {
2222
for charSet in charSets {
2323
let sessionIDBits = Float(128)
24-
let random = Random(charSet: charSet)
24+
let random = Random(charSet)
2525
let id = random.sessionID()
2626
let count = Int(ceilf(sessionIDBits / Float(charSet.bitsPerChar)))
2727
XCTAssertEqual(id.characters.count, count)
2828
}
2929
}
3030

3131
func testCharSet64() {
32-
random = Random(charSet:.charSet64)
32+
random = Random(.charSet64)
3333
entropyString( 6, [0xdd], "3")
3434
entropyString(12, [0x78, 0xfc], "eP")
3535
entropyString(18, [0xc5, 0x6f, 0x21], "xW8")
@@ -45,7 +45,7 @@ class RandomTests: XCTestCase {
4545
}
4646

4747
func testCharSet32() {
48-
random = Random(charSet:.charSet32)
48+
random = Random(.charSet32)
4949
entropyString( 5, [0xdd], "N")
5050
entropyString(10, [0x78, 0xfc], "p6")
5151
entropyString(15, [0x78, 0xfc], "p6R")
@@ -60,7 +60,7 @@ class RandomTests: XCTestCase {
6060
}
6161

6262
func testCharSet16() {
63-
random = Random(charSet:.charSet16)
63+
random = Random(.charSet16)
6464
entropyString( 4, [0x9d], "9")
6565
entropyString( 8, [0xae], "ae")
6666
entropyString(12, [0x01, 0xf2], "01f")
@@ -69,7 +69,7 @@ class RandomTests: XCTestCase {
6969
}
7070

7171
func testCharSet8() {
72-
random = Random(charSet:.charSet8)
72+
random = Random(.charSet8)
7373
entropyString( 3, [0x5a], "2")
7474
entropyString( 6, [0x5a], "26")
7575
entropyString( 9, [0x21, 0xa4], "103")
@@ -83,7 +83,7 @@ class RandomTests: XCTestCase {
8383
}
8484

8585
func testCharSet4() {
86-
random = Random(charSet:.charSet4)
86+
random = Random(.charSet4)
8787
entropyString( 2, [0x5a], "T")
8888
entropyString( 4, [0x5a], "TT")
8989
entropyString( 6, [0x93], "CTA")
@@ -95,7 +95,7 @@ class RandomTests: XCTestCase {
9595
}
9696

9797
func testCharSet2() {
98-
random = Random(charSet:.charSet2)
98+
random = Random(.charSet2)
9999
entropyString( 1, [0x27], "0")
100100
entropyString( 2, [0x27], "00")
101101
entropyString( 3, [0x27], "001")
@@ -110,7 +110,7 @@ class RandomTests: XCTestCase {
110110

111111
func testStringLengths() {
112112
for charSet in charSets {
113-
let random = Random(charSet: charSet)
113+
let random = Random(charSet)
114114
let iters = 128
115115
for i in 0 ..< iters {
116116
let string = random.string(bits: Float(i))
@@ -125,27 +125,27 @@ class RandomTests: XCTestCase {
125125
var random: Random
126126
var string: String
127127
do {
128-
random = try Random(chars:"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ9876543210_-")
128+
random = try Random("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ9876543210_-")
129129
string = try random.string(bits: 72, using: [0x9d, 0x99, 0x4e, 0xa5, 0xd2, 0x3f, 0x8c, 0x86, 0x80])
130130
XCTAssertEqual(string, "NzLoPDi-JiAa")
131131

132-
random = try Random(chars:"2346789BDFGHJMNPQRTbdfghjlmnpqrt")
132+
random = try Random("2346789BDFGHJMNPQRTbdfghjlmnpqrt")
133133
string = try random.string(bits: 55, using: [0xd2, 0xe3, 0xe9, 0xda, 0x19, 0x97, 0x52])
134134
XCTAssertEqual(string, "mHRrbgQlTqF")
135135

136-
random = try Random(chars:"0123456789ABCDEF")
136+
random = try Random("0123456789ABCDEF")
137137
string = try random.string(bits: 20, using: [0xc7, 0xc9, 0x00])
138138
XCTAssertEqual(string, "C7C90")
139139

140-
random = try Random(chars:"abcdefgh")
140+
random = try Random("abcdefgh")
141141
string = try random.string(bits: 30, using: [0xc7, 0xc9, 0x07, 0xc9])
142142
XCTAssertEqual(string, "gbheeeahgc")
143143

144-
random = try Random(chars:"atcg")
144+
random = try Random("atcg")
145145
string = try random.string(bits: 16, using: [0x20, 0xf1])
146146
XCTAssertEqual(string, "acaaggat")
147147

148-
random = try Random(chars:"HT")
148+
random = try Random("HT")
149149
string = try random.string(bits: 16, using: [0xe3, 0xe9])
150150
XCTAssertEqual(string, "TTTHHHTTTTTHTHHT")
151151
}
@@ -207,7 +207,7 @@ class RandomTests: XCTestCase {
207207

208208
func testNegativeEntropy() {
209209
do {
210-
let random = Random(charSet:.charSet32)
210+
let random = Random(.charSet32)
211211
let _ = try random.string(bits: -6, using: [0x33])
212212
}
213213
catch {
@@ -224,7 +224,7 @@ class RandomTests: XCTestCase {
224224
#if !os(Linux)
225225
func testSecRand() {
226226
for charSet in charSets {
227-
let random = Random(charSet: charSet)
227+
let random = Random(charSet)
228228
var secRand = false
229229
_ = random.string(bits: 36, secRand: &secRand)
230230
XCTAssertFalse(secRand)
@@ -248,7 +248,7 @@ class RandomTests: XCTestCase {
248248

249249
func entropyString(_ bits: Float, _ charSet: CharSet, _ bytes: [UInt8], _ expected: String) {
250250
do {
251-
let random = Random(charSet: charSet)
251+
let random = Random(charSet)
252252
let string = try random.string(bits: bits, using: bytes)
253253
XCTAssertEqual(string, expected)
254254
}
@@ -259,7 +259,7 @@ class RandomTests: XCTestCase {
259259

260260
func nonUniqueChars(_ chars: String) {
261261
do {
262-
let _ = try Random(chars: chars)
262+
let _ = try Random(chars)
263263
XCTFail("Should have thrown")
264264
}
265265
catch {
@@ -274,7 +274,7 @@ class RandomTests: XCTestCase {
274274

275275
func invalidCharCount(_ chars: String) {
276276
do {
277-
let _ = try Random(chars: chars)
277+
let _ = try Random(chars)
278278
XCTFail("Should have thrown")
279279
}
280280
catch {
@@ -289,7 +289,7 @@ class RandomTests: XCTestCase {
289289

290290
func invalidBytes(_ bits: Float, _ charSet: CharSet, _ bytes: [UInt8]) {
291291
do {
292-
let random = Random(charSet: charSet)
292+
let random = Random(charSet)
293293
_ = try random.string(bits: bits, using: bytes)
294294
XCTFail("Should have thrown")
295295
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /