Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

Commit

Permalink
Fix rest of test for tx processor
Browse files Browse the repository at this point in the history 
Add pcs deprecated to propagate transaction

Signed-off-by: Fedor Muratov <[email protected]>
  • Loading branch information
@muratovv
muratovv committed Aug 27, 2018
1 parent c619b78 commit 1f7f574
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 47 deletions.
1 change: 1 addition & 0 deletions irohad/network/peer_communication_service.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ namespace iroha {
class PeerCommunicationService {
public:
/**
* @deprecated use propagate_batch instead
* Propagate transaction in network
* @param transaction - object for propagation
*/
Expand Down
88 changes: 41 additions & 47 deletions test/module/irohad/torii/processor/transaction_processor_test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@ class TransactionProcessorTest : public ::testing::Test {
.quorum(1);
}

auto baseTestTx() {
auto baseTestTx(shared_model::interface::types::QuorumType quorum = 1) {
return TestTransactionBuilder()
.createdTime(iroha::time::now())
.creatorAccountId("user@domain")
.setAccountQuorum("user@domain", 2)
.quorum(1)
.quorum(quorum)
.build();
}

Expand Down Expand Up @@ -137,7 +137,7 @@ class TransactionProcessorTest : public ::testing::Test {
* @given transaction processor
* @when transactions passed to processor compose proposal which is sent to peer
* communication service
* @then for every transaction STATELESS_VALID status is returned
* @then for every transaction in batches STATELESS_VALID status is returned
*/
TEST_F(TransactionProcessorTest, TransactionProcessorOnProposalTest) {
std::vector<shared_model::proto::Transaction> txs;
Expand All @@ -155,7 +155,7 @@ TEST_F(TransactionProcessorTest, TransactionProcessorOnProposalTest) {
}));

EXPECT_CALL(*mp, propagateBatchImpl(_)).Times(0);
EXPECT_CALL(*pcs, propagate_transaction(_)).Times(txs.size());
EXPECT_CALL(*pcs, propagate_batch(_)).Times(txs.size());

for (const auto &tx : txs) {
tp->batchHandle(framework::batch::createBatchFromSingleTransaction(
Expand All @@ -175,9 +175,9 @@ TEST_F(TransactionProcessorTest, TransactionProcessorOnProposalTest) {

/**
* @given transactions from the same batch
* @when transactions sequence is created and propagated @and all transactions
* were returned by pcs in proposal notifier
* @then all transactions have stateless valid status
* @when transactions sequence is created and propagated
* AND all transactions were returned by pcs in proposal notifier
* @then all transactions in batches have stateless valid status
*/
TEST_F(TransactionProcessorTest, TransactionProcessorOnProposalBatchTest) {
using namespace shared_model::validation;
Expand Down Expand Up @@ -232,12 +232,12 @@ TEST_F(TransactionProcessorTest, TransactionProcessorOnProposalBatchTest) {
* @given transaction processor
* @when transactions compose proposal which is sent to peer
* communication service @and all transactions composed the block
* @then for every transaction STATEFUL_VALID status is returned
* @then for every transaction in bathces STATEFUL_VALID status is returned
*/
TEST_F(TransactionProcessorTest, TransactionProcessorBlockCreatedTest) {
std::vector<shared_model::proto::Transaction> txs;
for (size_t i = 0; i < proposal_size; i++) {
auto &&tx = TestTransactionBuilder().createdTime(i).build();
auto &&tx = addSignaturesFromKeyPairs(baseTestTx(), makeKey());
txs.push_back(tx);
status_map[tx.hash()] =
status_builder.notReceived().txHash(tx.hash()).build();
Expand All @@ -250,7 +250,7 @@ TEST_F(TransactionProcessorTest, TransactionProcessorBlockCreatedTest) {
}));

EXPECT_CALL(*mp, propagateBatchImpl(_)).Times(0);
EXPECT_CALL(*pcs, propagate_transaction(_)).Times(txs.size());
EXPECT_CALL(*pcs, propagate_batch(_)).Times(txs.size());

for (const auto &tx : txs) {
tp->batchHandle(framework::batch::createBatchFromSingleTransaction(
Expand Down Expand Up @@ -297,7 +297,7 @@ TEST_F(TransactionProcessorTest, TransactionProcessorBlockCreatedTest) {
TEST_F(TransactionProcessorTest, TransactionProcessorOnCommitTest) {
std::vector<shared_model::proto::Transaction> txs;
for (size_t i = 0; i < proposal_size; i++) {
auto &&tx = TestTransactionBuilder().createdTime(i).build();
auto &&tx = addSignaturesFromKeyPairs(baseTestTx(), makeKey());
txs.push_back(tx);
status_map[tx.hash()] =
status_builder.notReceived().txHash(tx.hash()).build();
Expand All @@ -310,7 +310,7 @@ TEST_F(TransactionProcessorTest, TransactionProcessorOnCommitTest) {
}));

EXPECT_CALL(*mp, propagateBatchImpl(_)).Times(0);
EXPECT_CALL(*pcs, propagate_transaction(_)).Times(txs.size());
EXPECT_CALL(*pcs, propagate_batch(_)).Times(txs.size());

for (const auto &tx : txs) {
tp->batchHandle(framework::batch::createBatchFromSingleTransaction(
Expand Down Expand Up @@ -426,43 +426,37 @@ TEST_F(TransactionProcessorTest, TransactionProcessorInvalidTxsTest) {
}

/**
* @given valid multisig tx
* @when transaction_processor handle it
* @then it goes to mst and after signing goes to PeerCommunicationService
* @given batch one transaction with quorum 2
* AND one signature
* @when transaction_processor handle the batch
* @then checks that batch is relayed to MST
*/
TEST_F(TransactionProcessorTest, MultisigTransaction) {
std::shared_ptr<shared_model::interface::TransactionBatch> after_mst;
auto mst_propagate =
[&after_mst](
std::shared_ptr<shared_model::interface::TransactionBatch> batch) {
auto keypair1 =
shared_model::crypto::DefaultCryptoAlgorithmType::generateKeypair();
auto signedBlob1 = shared_model::crypto::CryptoSigner<>::sign(
shared_model::crypto::Blob(batch->transactions().at(0)->payload()),
keypair1);
after_mst->addSignature(0, signedBlob1, keypair1.publicKey());
auto keypair2 =
shared_model::crypto::DefaultCryptoAlgorithmType::generateKeypair();
auto signedBlob2 = shared_model::crypto::CryptoSigner<>::sign(
shared_model::crypto::Blob(batch->transactions().at(0)->payload()),
keypair2);
after_mst->addSignature(0, signedBlob2, keypair2.publicKey());
};
EXPECT_CALL(*mp, propagateBatchImpl(_))
.WillOnce(testing::Invoke(mst_propagate));
EXPECT_CALL(*pcs, propagate_transaction(_)).Times(1);
TEST_F(TransactionProcessorTest, MultisigTransactionToMST) {
auto &&tx = addSignaturesFromKeyPairs(baseTestTx(2), makeKey());

std::shared_ptr<shared_model::interface::Transaction> tx =
clone(base_tx()
.quorum(2)
.build()
.signAndAddSignature(
shared_model::crypto::DefaultCryptoAlgorithmType::
generateKeypair())
.finish());
auto &&after_mst = framework::batch::createBatchFromSingleTransaction(
std::shared_ptr<shared_model::interface::Transaction>(clone(tx)));
EXPECT_CALL(*mp, propagateBatchImpl(_)).Times(1);

tp->batchHandle(framework::batch::createBatchFromSingleTransaction(tx));
mst_prepared_notifier.get_subscriber().on_next(after_mst);
tp->batchHandle(std::move(after_mst));
}

/**
* @given batch one transaction with quorum 2
* AND one signature
* @when MST emits the batch
* @then checks that PCS is invoked.
* This happens because tx processor is subscribed for MST
*/
TEST_F(TransactionProcessorTest, MultisigTransactionFromMst) {
auto &&tx = addSignaturesFromKeyPairs(baseTestTx(2), makeKey(), makeKey());

auto &&after_mst = framework::batch::createBatchFromSingleTransaction(
std::shared_ptr<shared_model::interface::Transaction>(clone(tx)));

EXPECT_CALL(*pcs, propagate_batch(_)).Times(1);
mst_prepared_notifier.get_subscriber().on_next(
std::make_shared<shared_model::interface::TransactionBatch>(after_mst));
}

/**
Expand All @@ -472,7 +466,7 @@ TEST_F(TransactionProcessorTest, MultisigTransaction) {
*/
TEST_F(TransactionProcessorTest, MultisigExpired) {
EXPECT_CALL(*mp, propagateBatchImpl(_)).Times(1);
EXPECT_CALL(*pcs, propagate_transaction(_)).Times(0);
EXPECT_CALL(*pcs, propagate_batch(_)).Times(0);

std::shared_ptr<shared_model::interface::Transaction> tx =
clone(base_tx()
Expand Down

0 comments on commit 1f7f574

Please sign in to comment.