Skip to content

Commit

Permalink
Tidy up network e2e test event listening
Browse files Browse the repository at this point in the history 
Change-Id: Ie8071dc8091d126ff72449cbafd105e80cfc916c
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
  • Loading branch information
@bestbeforetoday
bestbeforetoday committed Nov 2, 2018
1 parent 0f7c882 commit 486333f
Showing 1 changed file with 58 additions and 52 deletions.
110 changes: 58 additions & 52 deletions test/integration/network-e2e/invoke.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,24 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain an event hub that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
const org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let eventFired = -1;
let eventFired = 0;

// have to register for all transaction events (a new feature in 1.3) as
// there is no way to know what the initial transaction id is
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
eventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

t.true(org1EventHub.isconnected(), 'org1 event hub correctly connected');
t.false(org2EventHub.isconnected(), 'org2 event hub correctly not connected');
Expand Down Expand Up @@ -145,23 +146,24 @@ test('\n\n***** Network End-to-end flow: invoke multiple transactions to move mo
}
});

const transactions = new Array(3).fill('move').map((name) => contract.createTransaction(name));
const transactionIds = transactions.map((tx) => tx.getTransactionID().getTransactionID());

// Obtain an event hub that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
const org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let eventFired = -1;
let eventFired = 0;

// have to register for all transaction events (a new feature in 1.3) as
// there is no way to know what the initial transaction id is
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && transactionIds.includes(txId)) {
eventFired++;
}
}, () => {});

let response = await contract.submitTransaction('move', 'a', 'b', '100');
let response = await transactions[0].submit('a', 'b', '100');

t.true(org1EventHub.isconnected(), 'org1 event hub correctly connected');
t.false(org2EventHub.isconnected(), 'org2 event hub correctly not connected');
Expand All @@ -175,7 +177,7 @@ test('\n\n***** Network End-to-end flow: invoke multiple transactions to move mo
}

// second transaction for same connection
response = await contract.submitTransaction('move', 'a', 'b', '50');
response = await transactions[1].submit('a', 'b', '50');

t.equal(eventFired, 2, 'single event for org1 correctly unblocked submitTransaction');

Expand All @@ -186,7 +188,7 @@ test('\n\n***** Network End-to-end flow: invoke multiple transactions to move mo
}

// third transaction for same connection
response = await contract.submitTransaction('move', 'a', 'b', '25');
response = await transactions[2].submit('a', 'b', '25');

t.equal(eventFired, 3, 'single event for org1 correctly unblocked submitTransaction');

Expand Down Expand Up @@ -226,23 +228,24 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain an event hub that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
const org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let eventFired = -1;
let eventFired = 0;

// have to register for all transaction events (a new feature in 1.3) as
// there is no way to know what the initial transaction id is
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
eventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

t.false(org2EventHub.isconnected(), 'org2 event hub correctly not connected');
t.equal(eventFired, 1, 'single event for org1 correctly unblocked submitTransaction');
Expand Down Expand Up @@ -281,23 +284,24 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain an event hub that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
const org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let eventFired = -1;
let eventFired = 0;

// have to register for all transaction events (a new feature in 1.3) as
// there is no way to know what the initial transaction id is
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
eventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

t.false(org2EventHub.isconnected(), 'org2 event hub correctly not connected');
t.equal(eventFired, 1, 'single event for org1 correctly unblocked submitTransaction');
Expand Down Expand Up @@ -338,27 +342,28 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain the event hubs that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let org1EventFired = -1;
let org2EventFired = -1;
let org1EventFired = 0;
let org2EventFired = 0;
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org1EventFired++;
}
}, () => {});

org2EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org2EventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

const unblockCorrectly = (org1EventFired === 1) && (org2EventFired === 1);
t.pass(`org1 events: ${org1EventFired}, org2 events: ${org2EventFired}`);
Expand Down Expand Up @@ -402,27 +407,28 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain the event hubs that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let org1EventFired = -1;
let org2EventFired = -1;
let org1EventFired = 0;
let org2EventFired = 0;
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org1EventFired++;
}
}, () => {});

org2EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org2EventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

const unblockCorrectly = (org1EventFired === 1) && (org2EventFired === 1);
t.pass(`org1 events: ${org1EventFired}, org2 events: ${org2EventFired}`);
Expand Down Expand Up @@ -466,28 +472,28 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain the event hubs that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let org1EventFired = -1;
let org2EventFired = -1;

let org1EventFired = 0;
let org2EventFired = 0;
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org1EventFired++;
}
}, () => {});

org2EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org2EventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

const unblockCorrectly = (org1EventFired === 1 && org2EventFired === 0) ||
(org1EventFired === 0 && org2EventFired === 1)
Expand Down Expand Up @@ -536,28 +542,28 @@ test('\n\n***** Network End-to-end flow: invoke transaction to move money using
}
});

const transaction = contract.createTransaction('move');
const transactionId = transaction.getTransactionID().getTransactionID();

// Obtain the event hubs that that will be used by the underlying implementation
org1EventHub = await getFirstEventHubForOrg(gateway, 'Org1MSP');
org2EventHub = await getFirstEventHubForOrg(gateway, 'Org2MSP');

// Initialize eventFired to -1 since the event hub connection event will happen during
// the first call to submitTransaction() after the network is created
let org1EventFired = -1;
let org2EventFired = -1;

let org1EventFired = 0;
let org2EventFired = 0;
org1EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org1EventFired++;
}
}, () => {});

org2EventHub.registerTxEvent('all', (txId, code) => {
if (code === 'VALID') {
if (code === 'VALID' && txId === transactionId) {
org2EventFired++;
}
}, () => {});

const response = await contract.submitTransaction('move', 'a', 'b', '100');
const response = await transaction.submit('a', 'b', '100');

const unblockCorrectly = (org1EventFired === 1 && org2EventFired === 0) ||
(org1EventFired === 0 && org2EventFired === 1)
Expand Down

0 comments on commit 486333f

Please sign in to comment.