Use structured bindings in some places:

Most of the new uses either:
* Replace some uses of `tie`
* bind to pairs when iterating through maps
This commit is contained in:
seelabs
2019-08-06 09:11:32 -07:00
parent 9c58f23cf8
commit 7912ee6f7b
66 changed files with 428 additions and 466 deletions

View File

@@ -217,10 +217,10 @@ public:
for (std::size_t i = 0; i < 32; i++)
{
auto const keypair = randomKeyPair (KeyType::secp256k1);
auto const [pk, sk] = randomKeyPair (KeyType::secp256k1);
BEAST_EXPECT(keypair.first == derivePublicKey (KeyType::secp256k1, keypair.second));
BEAST_EXPECT(*publicKeyType (keypair.first) == KeyType::secp256k1);
BEAST_EXPECT(pk == derivePublicKey (KeyType::secp256k1, sk));
BEAST_EXPECT(*publicKeyType (pk) == KeyType::secp256k1);
for (std::size_t j = 0; j < 32; j++)
{
@@ -231,14 +231,14 @@ public:
crypto_prng());
auto sig = signDigest (
keypair.first, keypair.second, digest);
pk, sk, digest);
BEAST_EXPECT(sig.size() != 0);
BEAST_EXPECT(verifyDigest (keypair.first,
BEAST_EXPECT(verifyDigest (pk,
digest, sig, true));
// Wrong digest:
BEAST_EXPECT(!verifyDigest (keypair.first,
BEAST_EXPECT(!verifyDigest (pk,
~digest, sig, true));
// Slightly change the signature:
@@ -246,11 +246,11 @@ public:
ptr[j % sig.size()]++;
// Wrong signature:
BEAST_EXPECT(!verifyDigest (keypair.first,
BEAST_EXPECT(!verifyDigest (pk,
digest, sig, true));
// Wrong digest and signature:
BEAST_EXPECT(!verifyDigest (keypair.first,
BEAST_EXPECT(!verifyDigest (pk,
~digest, sig, true));
}
}
@@ -260,10 +260,10 @@ public:
{
for (std::size_t i = 0; i < 32; i++)
{
auto const keypair = randomKeyPair (type);
auto const [pk, sk] = randomKeyPair (type);
BEAST_EXPECT(keypair.first == derivePublicKey (type, keypair.second));
BEAST_EXPECT(*publicKeyType (keypair.first) == type);
BEAST_EXPECT(pk == derivePublicKey (type, sk));
BEAST_EXPECT(*publicKeyType (pk) == type);
for (std::size_t j = 0; j < 32; j++)
{
@@ -274,11 +274,11 @@ public:
crypto_prng());
auto sig = sign (
keypair.first, keypair.second,
pk, sk,
makeSlice (data));
BEAST_EXPECT(sig.size() != 0);
BEAST_EXPECT(verify(keypair.first,
BEAST_EXPECT(verify(pk,
makeSlice(data), sig, true));
// Construct wrong data:
@@ -290,7 +290,7 @@ public:
std::max_element (badData.begin(), badData.end()));
// Wrong data: should fail
BEAST_EXPECT(!verify (keypair.first,
BEAST_EXPECT(!verify (pk,
makeSlice(badData), sig, true));
// Slightly change the signature:
@@ -298,11 +298,11 @@ public:
ptr[j % sig.size()]++;
// Wrong signature: should fail
BEAST_EXPECT(!verify (keypair.first,
BEAST_EXPECT(!verify (pk,
makeSlice(data), sig, true));
// Wrong data and signature: should fail
BEAST_EXPECT(!verify (keypair.first,
BEAST_EXPECT(!verify (pk,
makeSlice(badData), sig, true));
}
}