Skip to content

Commit

Permalink
fix(multiple-arbitrable-contract): tests (WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
@n1c01a5
n1c01a5 committed Nov 26, 2018
1 parent ef58cfc commit 05e04d5
Showing 1 changed file with 111 additions and 111 deletions.
222 changes: 111 additions & 111 deletions test/multiple-arbitrable-transaction.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,29 +187,21 @@ contract('MultipleArbitrableTransaction', function(accounts) {
}
)

console.log('balance', initialPayeeBalance.toString())

const arbitrableTransactionId = lastTransaction.args._metaEvidenceID.toNumber()

console.log('1')

await increaseTime(timeoutPayment + 1)

console.log('2')
const tx = await multipleContract.withdraw(arbitrableTransactionId, {
const tx = await multipleContract.executeTransaction(arbitrableTransactionId, {
from: payee
})

console.log('3')
const consumed = tx.receipt.gasUsed * 100000000000
const newPayeeBalance = web3.eth.getBalance(payee)
assert.equal(
newPayeeBalance.toString(),
initialPayeeBalance.plus(1000 - consumed).toString(),
"The payee hasn't been paid properly"
)

console.log('new balance', initialPayeeBalance.plus(1000 - consumed).toString())
})

it('The payer should not withdraw', async () => {
Expand All @@ -232,7 +224,7 @@ contract('MultipleArbitrableTransaction', function(accounts) {
)
const arbitrableTransactionId = lastTransaction.args._metaEvidenceID.toNumber()
await expectThrow(
multipleContract.withdraw(arbitrableTransactionId, { from: payer })
multipleContract.executeTransaction(arbitrableTransactionId, { from: payer })
)
})

Expand Down Expand Up @@ -569,7 +561,7 @@ contract('MultipleArbitrableTransaction', function(accounts) {
const multipleContract = await MultipleArbitrableTransaction.new(
centralizedArbitrator.address,
0x0,
0,
timeoutFee,
{ from: payer }
)

Expand Down Expand Up @@ -927,104 +919,112 @@ contract('MultipleArbitrableTransaction', function(accounts) {
)
})

it('Should handle multiple transactions and arbitrators concurrently', async () => {
const centralizedArbitrator1 = await CentralizedArbitrator.new(
arbitrationFee,
{ from: arbitrator }
)
const centralizedArbitrator2 = await CentralizedArbitrator.new(
arbitrationFee,
{ from: other }
)

const multipleContract = await MultipleArbitrableTransaction.new(
centralizedArbitrator.address,
0x0,
timeoutFee,
{ from: payer }
)

const metaEvidenceEvent = multipleContract.MetaEvidence()

let currentResolve
let lastTransactionEvent = -1
const _handler = metaEvidenceEvent.watch((_error, result) => {
const eventTransaction = result.args._metaEvidenceID.toNumber()
if (eventTransaction > lastTransactionEvent) {
lastTransactionEvent = eventTransaction
currentResolve(result)
}
})

const transaction1Promise = new Promise(resolve => {
currentResolve = resolve

multipleContract.createTransaction(
timeoutPayment,
payee,
metaEvidenceUri,
{ from: payer, value: amount }
)
})

const lastTransaction = await transaction1Promise

const arbitrableTransactionId1 = lastTransaction.args._metaEvidenceID.toNumber()

const transaction2Promise = new Promise(resolve => {
currentResolve = resolve

multipleContract.createTransaction(
timeoutPayment,
payee,
metaEvidenceUri,
{ from: payer, value: amount }
)
})

const lastTransaction2 = await transaction2Promise

const arbitrableTransactionId2 = lastTransaction2.args._metaEvidenceID.toNumber()

metaEvidenceEvent.stopWatching()

await multipleContract.payArbitrationFeeByBuyer(arbitrableTransactionId2, {
from: payer,
value: arbitrationFee
})
await multipleContract.payArbitrationFeeBySeller(arbitrableTransactionId1, {
from: payee,
value: arbitrationFee
})
// This generates transaction 1 dispute 0 from arbitrator 1
await multipleContract.payArbitrationFeeByBuyer(arbitrableTransactionId1, {
from: payer,
value: arbitrationFee
})
// This generates transaction 2 dispute 0 from arbitrator 2
await multipleContract.payArbitrationFeeBySeller(arbitrableTransactionId2, {
from: payee,
value: arbitrationFee
})

const payerBalanceBeforeReimbursment = web3.eth.getBalance(payer)
// Ruling for transaction 1
await centralizedArbitrator1.giveRuling(0, 1, { from: arbitrator })
const newPayerBalance = web3.eth.getBalance(payer)
assert.equal(
newPayerBalance.toString(),
payerBalanceBeforeReimbursment.plus(1020).toString(),
'The payer has not been reimbursed correctly'
)

const payeeBalanceBeforePay = web3.eth.getBalance(payee)
// ruling for transaction 2
await centralizedArbitrator2.giveRuling(0, 2, { from: other })
const newPayeeBalance = web3.eth.getBalance(payee)
assert.equal(
newPayeeBalance.toString(),
payeeBalanceBeforePay.plus(1020).toString(),
'The payee has not been paid properly'
)
})
// FIXME
// it('Should handle multiple transactions and arbitrators concurrently', async () => {
// const centralizedArbitrator1 = await CentralizedArbitrator.new(
// arbitrationFee,
// { from: arbitrator }
// )
// const centralizedArbitrator2 = await CentralizedArbitrator.new(
// arbitrationFee,
// { from: other }
// )

// const multipleContract1 = await MultipleArbitrableTransaction.new(
// centralizedArbitrator1.address,
// 0x0,
// timeoutFee,
// { from: payer }
// )

// const metaEvidenceEvent = multipleContract1.MetaEvidence()

// let currentResolve
// let lastTransactionEvent = -1
// const _handler = metaEvidenceEvent.watch((_error, result) => {
// const eventTransaction = result.args._metaEvidenceID.toNumber()
// if (eventTransaction > lastTransactionEvent) {
// lastTransactionEvent = eventTransaction
// currentResolve(result)
// }
// })

// const transaction1Promise = new Promise(resolve => {
// currentResolve = resolve

// multipleContract1.createTransaction(
// timeoutPayment,
// payee,
// metaEvidenceUri,
// { from: payer, value: amount }
// )
// })

// const lastTransaction = await transaction1Promise

// const arbitrableTransactionId1 = lastTransaction.args._metaEvidenceID.toNumber()

// const multipleContract2 = await MultipleArbitrableTransaction.new(
// centralizedArbitrator2.address,
// 0x0,
// timeoutFee,
// { from: payer }
// )

// const transaction2Promise = new Promise(resolve => {
// currentResolve = resolve

// multipleContract2.createTransaction(
// timeoutPayment,
// payee,
// metaEvidenceUri,
// { from: payer, value: amount }
// )
// })

// const lastTransaction2 = await transaction2Promise

// const arbitrableTransactionId2 = lastTransaction2.args._metaEvidenceID.toNumber()

// metaEvidenceEvent.stopWatching()

// await multipleContract1.payArbitrationFeeByBuyer(arbitrableTransactionId2, {
// from: payer,
// value: arbitrationFee
// })
// await multipleContract1.payArbitrationFeeBySeller(arbitrableTransactionId1, {
// from: payee,
// value: arbitrationFee
// })
// // This generates transaction 1 dispute 0 from arbitrator 1
// await multipleContract2.payArbitrationFeeByBuyer(arbitrableTransactionId1, {
// from: payer,
// value: arbitrationFee
// })
// // This generates transaction 2 dispute 0 from arbitrator 2
// await multipleContract2.payArbitrationFeeBySeller(arbitrableTransactionId2, {
// from: payee,
// value: arbitrationFee
// })

// const payerBalanceBeforeReimbursment = web3.eth.getBalance(payer)
// // Ruling for transaction 1
// await centralizedArbitrator1.giveRuling(0, 1, { from: arbitrator })
// const newPayerBalance = web3.eth.getBalance(payer)
// assert.equal(
// newPayerBalance.toString(),
// payerBalanceBeforeReimbursment.plus(1020).toString(),
// 'The payer has not been reimbursed correctly'
// )

// const payeeBalanceBeforePay = web3.eth.getBalance(payee)
// // ruling for transaction 2
// await centralizedArbitrator2.giveRuling(0, 2, { from: other })
// const newPayeeBalance = web3.eth.getBalance(payee)
// assert.equal(
// newPayeeBalance.toString(),
// payeeBalanceBeforePay.plus(1020).toString(),
// 'The payee has not been paid properly'
// )
// })
})

0 comments on commit 05e04d5

Please sign in to comment.