@@ -86,19 +86,19 @@ extension SECP256K1 {
8686 internal static func recoverPublicKey( hash: Data , recoverableSignature: inout secp256k1_ecdsa_recoverable_signature ) -> secp256k1_pubkey ? {
8787 guard let context = context, hash. count == 32 else { return nil }
8888 var publicKey : secp256k1_pubkey = secp256k1_pubkey ( )
89- let result = hash. withUnsafeBytes ( { ( hashRawBufferPointer: UnsafeRawBufferPointer ) -> Int32 ? in
89+ let result = hash. withUnsafeBytes { ( hashRawBufferPointer: UnsafeRawBufferPointer ) -> Int32 ? in
9090 if let hashRawPointer = hashRawBufferPointer. baseAddress, hashRawBufferPointer. count > 0 {
9191 let hashPointer = hashRawPointer. assumingMemoryBound ( to: UInt8 . self)
92- return withUnsafePointer ( to: & recoverableSignature, { ( signaturePointer: UnsafePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
93- withUnsafeMutablePointer ( to: & publicKey, { ( pubKeyPtr: UnsafeMutablePointer < secp256k1_pubkey > ) -> Int32 in
92+ return withUnsafePointer ( to: & recoverableSignature) { ( signaturePointer: UnsafePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
93+ withUnsafeMutablePointer ( to: & publicKey) { ( pubKeyPtr: UnsafeMutablePointer < secp256k1_pubkey > ) -> Int32 in
9494 let res = secp256k1_ecdsa_recover ( context, pubKeyPtr, signaturePointer, hashPointer)
9595 return res
96- } )
97- } )
96+ }
97+ }
9898 } else {
9999 return nil
100100 }
101- } )
101+ }
102102 guard let res = result, res != 0 else {
103103 return nil
104104 }
@@ -131,16 +131,16 @@ extension SECP256K1 {
131131 let result = serializedPubkey. withUnsafeMutableBytes { serializedPubkeyRawBuffPointer -> Int32 ? in
132132 if let serializedPkRawPointer = serializedPubkeyRawBuffPointer. baseAddress, serializedPubkeyRawBuffPointer. count > 0 {
133133 let serializedPubkeyPointer = serializedPkRawPointer. assumingMemoryBound ( to: UInt8 . self)
134- return withUnsafeMutablePointer ( to: & keyLength, { ( keyPtr: UnsafeMutablePointer < Int > ) -> Int32 in
135- withUnsafeMutablePointer ( to: & publicKey, { ( pubKeyPtr: UnsafeMutablePointer < secp256k1_pubkey > ) -> Int32 in
134+ return withUnsafeMutablePointer ( to: & keyLength) { ( keyPtr: UnsafeMutablePointer < Int > ) -> Int32 in
135+ withUnsafeMutablePointer ( to: & publicKey) { ( pubKeyPtr: UnsafeMutablePointer < secp256k1_pubkey > ) -> Int32 in
136136 let res = secp256k1_ec_pubkey_serialize ( context,
137137 serializedPubkeyPointer,
138138 keyPtr,
139139 pubKeyPtr,
140140 UInt32 ( compressed ? SECP256K1_EC_COMPRESSED : SECP256K1_EC_UNCOMPRESSED) )
141141 return res
142- } )
143- } )
142+ }
143+ }
144144 } else {
145145 return nil
146146 }
@@ -188,10 +188,10 @@ extension SECP256K1 {
188188 let result = serializedSignature. withUnsafeBytes { ( serRawBufferPtr: UnsafeRawBufferPointer ) -> Int32 ? in
189189 if let serRawPtr = serRawBufferPtr. baseAddress, serRawBufferPtr. count > 0 {
190190 let serPtr = serRawPtr. assumingMemoryBound ( to: UInt8 . self)
191- return withUnsafeMutablePointer ( to: & recoverableSignature, { ( signaturePointer: UnsafeMutablePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
191+ return withUnsafeMutablePointer ( to: & recoverableSignature) { ( signaturePointer: UnsafeMutablePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
192192 let res = secp256k1_ecdsa_recoverable_signature_parse_compact ( context, signaturePointer, serPtr, v)
193193 return res
194- } )
194+ }
195195 } else {
196196 return nil
197197 }
@@ -210,10 +210,10 @@ extension SECP256K1 {
210210 if let serSignatureRawPointer = serSignatureRawBufferPointer. baseAddress, serSignatureRawBufferPointer. count > 0 {
211211 let serSignaturePointer = serSignatureRawPointer. assumingMemoryBound ( to: UInt8 . self)
212212 return withUnsafePointer ( to: & recoverableSignature) { ( signaturePointer: UnsafePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
213- withUnsafeMutablePointer ( to: & v, { ( vPtr: UnsafeMutablePointer < Int32 > ) -> Int32 in
213+ withUnsafeMutablePointer ( to: & v) { ( vPtr: UnsafeMutablePointer < Int32 > ) -> Int32 in
214214 let res = secp256k1_ecdsa_recoverable_signature_serialize_compact ( context, serSignaturePointer, vPtr, signaturePointer)
215215 return res
216- } )
216+ }
217217 }
218218 } else {
219219 return nil
@@ -244,24 +244,24 @@ extension SECP256K1 {
244244 let result = hash. withUnsafeBytes { hashRBPointer -> Int32 ? in
245245 if let hashRPointer = hashRBPointer. baseAddress, hashRBPointer. count > 0 {
246246 let hashPointer = hashRPointer. assumingMemoryBound ( to: UInt8 . self)
247- return privateKey. withUnsafeBytes ( { privateKeyRBPointer -> Int32 ? in
247+ return privateKey. withUnsafeBytes { privateKeyRBPointer -> Int32 ? in
248248 if let privateKeyRPointer = privateKeyRBPointer. baseAddress, privateKeyRBPointer. count > 0 {
249249 let privateKeyPointer = privateKeyRPointer. assumingMemoryBound ( to: UInt8 . self)
250- return extraEntropy. withUnsafeBytes ( { extraEntropyRBPointer -> Int32 ? in
250+ return extraEntropy. withUnsafeBytes { extraEntropyRBPointer -> Int32 ? in
251251 if let extraEntropyRPointer = extraEntropyRBPointer. baseAddress, extraEntropyRBPointer. count > 0 {
252252 let extraEntropyPointer = extraEntropyRPointer. assumingMemoryBound ( to: UInt8 . self)
253- return withUnsafeMutablePointer ( to: & recoverableSignature, { ( recSignaturePtr: UnsafeMutablePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
253+ return withUnsafeMutablePointer ( to: & recoverableSignature) { ( recSignaturePtr: UnsafeMutablePointer < secp256k1_ecdsa_recoverable_signature > ) -> Int32 in
254254 let res = secp256k1_ecdsa_sign_recoverable ( context, recSignaturePtr, hashPointer, privateKeyPointer, nil , useExtraEntropy ? extraEntropyPointer : nil )
255255 return res
256- } )
256+ }
257257 } else {
258258 return nil
259259 }
260- } )
260+ }
261261 } else {
262262 return nil
263263 }
264- } )
264+ }
265265 } else {
266266 return nil
267267 }
0 commit comments