Auto merge of #1254 - ebfull:tx-structure-changes, r=bitcartel

Change memo field size and relocate `ciphertexts` field of JoinSplit description

Closes #1190
Closes #1187
This commit is contained in:
zkbot
2016-08-18 16:49:47 +00:00
6 changed files with 513 additions and 511 deletions

View File

@@ -29,8 +29,8 @@ TEST(noteencryption, api)
ASSERT_TRUE(b.get_epk() != c.get_epk());
}
boost::array<unsigned char, 201> message;
for (unsigned char i = 0; i < 201; i++) {
boost::array<unsigned char, ZC_NOTEPLAINTEXT_SIZE> message;
for (size_t i = 0; i < ZC_NOTEPLAINTEXT_SIZE; i++) {
// Fill the message with dummy data
message[i] = (unsigned char) i;
}
@@ -195,4 +195,4 @@ TEST(noteencryption, prf_rho)
TEST(noteencryption, uint252)
{
ASSERT_THROW(uint252(uint256S("f6da8716682d600f74fc16bd0187faad6a26b4aa4c24d5c055b216d94516847e")), std::domain_error);
}
}