Skip to content

Commit d0f11e2

Browse files
author
Vyacheslav
authored
Merge pull request hyperledger-indy#827 from AxelNennker/single-character_string_constant
use character instead of single character string
2 parents 6415ac8 + a340c70 commit d0f11e2

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎libindy/src/domain/anoncreds/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ pub mod revocation_state;
1414
pub mod schema;
1515
pub mod master_secret;
1616

17-
pub const DELIMITER: &'static str = ":";
17+
pub const DELIMITER: char = ':';

‎libindy/src/services/crypto/mod.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ impl CryptoService {
142142
pub fn sign(&self, my_key: &Key, doc: &[u8]) -> Result<Vec<u8>, CryptoError> {
143143
trace!("sign >>> my_key: {:?}, doc: {:?}", my_key, doc);
144144

145-
let crypto_type_name = if my_key.verkey.contains(":") {
146-
let splits: Vec<&str> = my_key.verkey.split(":").collect();
145+
let crypto_type_name = if my_key.verkey.contains(':') {
146+
let splits: Vec<&str> = my_key.verkey.split(':').collect();
147147
splits[1]
148148
} else {
149149
DEFAULT_CRYPTO_TYPE
@@ -168,8 +168,8 @@ impl CryptoService {
168168
pub fn verify(&self, their_vk: &str, msg: &[u8], signature: &[u8]) -> Result<bool, CryptoError> {
169169
trace!("verify >>> their_vk: {:?}, msg: {:?}, signature: {:?}", their_vk, msg, signature);
170170

171-
let (their_vk, crypto_type_name) = if their_vk.contains(":") {
172-
let splits: Vec<&str> = their_vk.split(":").collect();
171+
let (their_vk, crypto_type_name) = if their_vk.contains(':') {
172+
let splits: Vec<&str> = their_vk.split(':').collect();
173173
(splits[0], splits[1])
174174
} else {
175175
(their_vk, DEFAULT_CRYPTO_TYPE)
@@ -210,15 +210,15 @@ impl CryptoService {
210210
pub fn encrypt(&self, my_key: &Key, their_vk: &str, doc: &[u8]) -> Result<(Vec<u8>, Vec<u8>), CryptoError> {
211211
trace!("encrypt >>> my_key: {:?}, their_vk: {:?}, doc: {:?}", my_key, their_vk, doc);
212212

213-
let (_my_vk, crypto_type_name) = if my_key.verkey.contains(":") {
214-
let splits: Vec<&str> = my_key.verkey.split(":").collect();
213+
let (_my_vk, crypto_type_name) = if my_key.verkey.contains(':') {
214+
let splits: Vec<&str> = my_key.verkey.split(':').collect();
215215
(splits[0], splits[1])
216216
} else {
217217
(my_key.verkey.as_str(), DEFAULT_CRYPTO_TYPE)
218218
};
219219

220-
let (their_vk, their_crypto_type_name) = if their_vk.contains(":") {
221-
let splits: Vec<&str> = their_vk.split(":").collect();
220+
let (their_vk, their_crypto_type_name) = if their_vk.contains(':') {
221+
let splits: Vec<&str> = their_vk.split(':').collect();
222222
(splits[0], splits[1])
223223
} else {
224224
(their_vk, DEFAULT_CRYPTO_TYPE)
@@ -252,15 +252,15 @@ impl CryptoService {
252252
pub fn decrypt(&self, my_key: &Key, their_vk: &str, doc: &[u8], nonce: &[u8]) -> Result<Vec<u8>, CryptoError> {
253253
trace!("decrypt >>> my_key: {:?}, their_vk: {:?}, doc: {:?}, nonce: {:?}", my_key, their_vk, doc, nonce);
254254

255-
let (_my_vk, crypto_type_name) = if my_key.verkey.contains(":") {
256-
let splits: Vec<&str> = my_key.verkey.split(":").collect();
255+
let (_my_vk, crypto_type_name) = if my_key.verkey.contains(':') {
256+
let splits: Vec<&str> = my_key.verkey.split(':').collect();
257257
(splits[0], splits[1])
258258
} else {
259259
(my_key.verkey.as_str(), DEFAULT_CRYPTO_TYPE)
260260
};
261261

262-
let (their_vk, their_crypto_type_name) = if their_vk.contains(":") {
263-
let splits: Vec<&str> = their_vk.split(":").collect();
262+
let (their_vk, their_crypto_type_name) = if their_vk.contains(':') {
263+
let splits: Vec<&str> = their_vk.split(':').collect();
264264
(splits[0], splits[1])
265265
} else {
266266
(their_vk, DEFAULT_CRYPTO_TYPE)
@@ -294,8 +294,8 @@ impl CryptoService {
294294
pub fn encrypt_sealed(&self, their_vk: &str, doc: &[u8]) -> Result<Vec<u8>, CryptoError> {
295295
trace!("encrypt_sealed >>> their_vk: {:?}, doc: {:?}", their_vk, doc);
296296

297-
let (their_vk, crypto_type_name) = if their_vk.contains(":") {
298-
let splits: Vec<&str> = their_vk.split(":").collect();
297+
let (their_vk, crypto_type_name) = if their_vk.contains(':') {
298+
let splits: Vec<&str> = their_vk.split(':').collect();
299299
(splits[0], splits[1])
300300
} else {
301301
(their_vk, DEFAULT_CRYPTO_TYPE)
@@ -319,8 +319,8 @@ impl CryptoService {
319319
pub fn decrypt_sealed(&self, my_key: &Key, doc: &[u8]) -> Result<Vec<u8>, CryptoError> {
320320
trace!("decrypt_sealed >>> my_key: {:?}, doc: {:?}", my_key, doc);
321321

322-
let (my_vk, crypto_type_name) = if my_key.verkey.contains(":") {
323-
let splits: Vec<&str> = my_key.verkey.split(":").collect();
322+
let (my_vk, crypto_type_name) = if my_key.verkey.contains(':') {
323+
let splits: Vec<&str> = my_key.verkey.split(':').collect();
324324
(splits[0], splits[1])
325325
} else {
326326
(my_key.verkey.as_str(), DEFAULT_CRYPTO_TYPE)
@@ -348,7 +348,7 @@ impl CryptoService {
348348

349349
let res = match seed {
350350
Some(ref seed) =>
351-
if seed.ends_with("=") {
351+
if seed.ends_with('=') {
352352
Some(base64::decode(&seed)
353353
.map_err(|err| CommonError::InvalidStructure(format!("Can't deserialize Seed from Base64 string: {:?}", err)))?)
354354
} else {
@@ -365,8 +365,8 @@ impl CryptoService {
365365
pub fn validate_key(&self, vk: &str) -> Result<(), CryptoError> {
366366
trace!("validate_key >>> vk: {:?}", vk);
367367

368-
let (vk, crypto_type_name) = if vk.contains(":") {
369-
let splits: Vec<&str> = vk.split(":").collect();
368+
let (vk, crypto_type_name) = if vk.contains(':') {
369+
let splits: Vec<&str> = vk.split(':').collect();
370370
(splits[0], splits[1])
371371
} else {
372372
(vk, DEFAULT_CRYPTO_TYPE)
@@ -378,7 +378,7 @@ impl CryptoService {
378378

379379
let crypto_type = self.crypto_types.get(crypto_type_name).unwrap();
380380

381-
let vk = if vk.starts_with("~") { &vk[1..] } else { vk };
381+
let vk = if vk.starts_with('~') { &vk[1..] } else { vk };
382382
let vk = Base58::decode(vk)?;
383383

384384
let res =crypto_type.validate_key(&vk)?;

‎libindy/src/services/payments.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ impl PaymentsService {
324324
}
325325

326326
fn _parse_method_from_payment_address(&self, address: &str) -> Option<String> {
327-
let res: Vec<&str> = address.split(":").collect();
327+
let res: Vec<&str> = address.split(':').collect();
328328
match res.len() {
329329
3 => res.get(1).map(|s| s.to_string()),
330330
_ => None
@@ -487,4 +487,4 @@ mod cbs {
487487

488488
Some(_callback)
489489
}
490-
}
490+
}

‎libindy/src/services/pool/transaction_handler.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ impl TransactionHandler {
450450
constants::GET_REVOC_REG_DEF => {
451451
if let Some(id) = json_msg["id"].as_str() {
452452
//FIXME
453-
id.splitn(2, ":").next().unwrap()
453+
id.splitn(2, ':').next().unwrap()
454454
.as_bytes().to_vec()
455455
} else {
456456
trace!("TransactionHandler::parse_reply_for_proof_checking: <<< No dest");

‎libindy/src/utils/crypto/verkey_builder.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use utils::crypto::base58::Base58;
44

55
pub fn build_full_verkey(dest: &str, verkey: Option<&str>) -> Result<String, CommonError> {
66
if let Some(verkey) = verkey {
7-
let (verkey, crypto_type) = if verkey.contains(":") {
8-
let splits: Vec<&str> = verkey.split(":").collect();
7+
let (verkey, crypto_type) = if verkey.contains(':') {
8+
let splits: Vec<&str> = verkey.split(':').collect();
99
(splits[0], Some(splits[1]))
1010
} else {
1111
(verkey, None)
1212
};
1313

14-
let verkey = if verkey.starts_with("~") {
14+
let verkey = if verkey.starts_with('~') {
1515
let mut result = Base58::decode(dest)?;
1616
let mut end = Base58::decode(&verkey[1..])?;
1717
result.append(&mut end);

0 commit comments

Comments
 (0)