Merge pull request #106 from Havven/queue-check

Changed mechanism for struct initialisation.

Author: hav-noms

contracts/Depot.sol

@@ -296,7 +296,9 @@ contract Depot is SelfDestructible, Pausable {
                     // Ok, this deposit can fulfill the whole remainder. We don't need
                     // to change anything about our queue we can just fulfill it.
                     // Subtract the amount from our deposit and total.
-                    deposit.amount = deposit.amount.sub(remainingToFulfill);
+                    uint newAmount = deposit.amount.sub(remainingToFulfill);
+                    deposits[i] = synthDeposit({ user: deposit.user, amount: newAmount});
+                    
                     totalSellableDeposits = totalSellableDeposits.sub(remainingToFulfill);
 
                     // Transfer the ETH to the depositor. Send is used instead of transfer

test/Depot.js

@@ -495,6 +495,55 @@ contract('Depot', async function(accounts) {
 			);
 		});
 
+		it('is less than one deposit (and that the queue is correctly updated)', async function() {
+			const synthsToDeposit = toUnit('500');
+			const ethToSend = toUnit('0.5');
+
+			// Send the synths to the Token Depot.
+			await synth.transferSenderPaysFee(depot.address, synthsToDeposit, {
+				from: depositor,
+			});
+
+			const depositStartIndex = await depot.depositStartIndex();
+			const depositEndIndex = await depot.depositEndIndex();
+
+			// Assert that there is now one deposit in the queue.
+			assert.equal(depositStartIndex, 0);
+			assert.equal(depositEndIndex, 1);
+
+			// And assert that our total has increased by the right amount.
+			const totalSellableDeposits = await depot.totalSellableDeposits();
+			assert.bnEqual(totalSellableDeposits, synthsToDeposit);
+
+			assert.bnEqual(await depot.totalSellableDeposits(), (await depot.deposits(0)).amount);
+
+			// Now purchase some.
+			const txn = await depot.exchangeEtherForSynths({
+				from: purchaser,
+				value: ethToSend,
+			});
+
+			// Exchange("ETH", msg.value, "sUSD", fulfilled);
+			const exchangeEvent = txn.logs.find(log => log.event === 'Exchange');
+			assert.eventEqual(exchangeEvent, 'Exchange', {
+				fromCurrency: 'ETH',
+				fromAmount: ethToSend,
+				toCurrency: 'sUSD',
+				toAmount: synthsToDeposit.div(web3.utils.toBN('2')),
+			});
+
+			// We should have one deposit in the queue with half the amount
+			assert.equal(await depot.depositStartIndex(), 0);
+			assert.equal(await depot.depositEndIndex(), 1);
+
+			assert.bnEqual(await depot.totalSellableDeposits(), (await depot.deposits(0)).amount);
+
+			assert.bnEqual(
+				await depot.totalSellableDeposits(),
+				synthsToDeposit.div(web3.utils.toBN('2'))
+			);
+		});
+
 		it('exceeds one deposit (and that the queue is correctly updated)', async function() {
 			const synthsToDeposit = web3.utils.toWei('600');
 			const totalSynthsDeposit = web3.utils.toWei('1200');