node: Clean up messy issue in test

This commit is contained in:
Andras Slemmer 2016-09-01 18:01:05 +01:00
parent 0298ccf0d6
commit ca1b0083ed

View File

@ -184,12 +184,15 @@ class WalletMonitorServiceTests {
val recipient = monitorServiceNode.services.storageService.myLegalIdentity val recipient = monitorServiceNode.services.storageService.myLegalIdentity
registerNode.net.send(registerNode.net.createMessage(WalletMonitorService.OUT_EVENT_TOPIC, DEFAULT_SESSION_ID, ClientToServiceCommandMessage(sessionID, registerNode.net.myAddress, // Tell the monitoring service node to issue some cash so we can spend it later
ClientToServiceCommand.IssueCash(Amount(quantity, GBP), OpaqueBytes.of(0), recipient, recipient)).serialize().bits), monitorServiceNode.net.myAddress) val issueCommand = ClientToServiceCommand.IssueCash(Amount(quantity, GBP), OpaqueBytes.of(0), recipient, recipient)
val outEvent = ClientToServiceCommand.PayCash(Amount(quantity, Issued(recipient.ref(0), GBP)), recipient) val issueMessage = registerNode.net.createMessage(WalletMonitorService.OUT_EVENT_TOPIC, DEFAULT_SESSION_ID,
val message = registerNode.net.createMessage(WalletMonitorService.OUT_EVENT_TOPIC, DEFAULT_SESSION_ID, ClientToServiceCommandMessage(sessionID, registerNode.net.myAddress, issueCommand).serialize().bits)
ClientToServiceCommandMessage(sessionID, registerNode.net.myAddress, outEvent).serialize().bits) registerNode.net.send(issueMessage, monitorServiceNode.net.myAddress)
registerNode.net.send(message, monitorServiceNode.net.myAddress) val payCommand = ClientToServiceCommand.PayCash(Amount(quantity, Issued(recipient.ref(0), GBP)), recipient)
val payMessage = registerNode.net.createMessage(WalletMonitorService.OUT_EVENT_TOPIC, DEFAULT_SESSION_ID,
ClientToServiceCommandMessage(sessionID, registerNode.net.myAddress, payCommand).serialize().bits)
registerNode.net.send(payMessage, monitorServiceNode.net.myAddress)
network.runNetwork() network.runNetwork()
events.expectEvents(isStrict = false) { events.expectEvents(isStrict = false) {