lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename cartridge to cassette

Browse source
This commit is contained in:
Josh Harvey 2017-04-24 01:20:00 +03:00
parent cc32bc39e8
commit 8674816d27
9 changed files with 67 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/plugins.js
View file

@ -72,47 +72,47 @@ function plugins (settings, deviceId) {
return balances
}
function buildCartridges () {
function buildCassettes () {
const config = configManager.machineScoped(deviceId, settings.config)
if (!config.cashOutEnabled) return Promise.resolve()
const cartridges = [ config.topCashOutDenomination,
const cassettes = [ config.topCashOutDenomination,
config.bottomCashOutDenomination ]
const virtualCartridges = [config.virtualCashOutDenomination]
const virtualCassettes = [config.virtualCashOutDenomination]
return dbm.cartridgeCounts(deviceId)
return dbm.cassetteCounts(deviceId)
.then(rec => {
if (argv.cassettes) {
const counts = argv.cassettes.split(',')
return {
cartridges: [
cassettes: [
{
denomination: parseInt(cartridges[0], 10),
denomination: parseInt(cassettes[0], 10),
count: parseInt(counts[0], 10)
},
{
denomination: parseInt(cartridges[1], 10),
denomination: parseInt(cassettes[1], 10),
count: parseInt(counts[1], 10)
}
],
virtualCartridges
virtualCassettes
}
}
return {
cartridges: [
cassettes: [
{
denomination: parseInt(cartridges[0], 10),
denomination: parseInt(cassettes[0], 10),
count: parseInt(rec.counts[0], 10)
},
{
denomination: parseInt(cartridges[1], 10),
denomination: parseInt(cassettes[1], 10),
count: parseInt(rec.counts[1], 10)
}
],
virtualCartridges
virtualCassettes
}
})
}
@ -138,20 +138,20 @@ function plugins (settings, deviceId) {
const currentConfigVersionPromise = fetchCurrentConfigVersion()
const promises = [
buildCartridges(),
buildCassettes(),
pingPromise,
currentConfigVersionPromise
].concat(tickerPromises, balancePromises)
return Promise.all(promises)
.then(arr => {
const cartridges = arr[0]
const cassettes = arr[0]
const currentConfigVersion = arr[2]
const tickers = arr.slice(3, cryptoCodes.length + 3)
const balances = arr.slice(cryptoCodes.length + 3)
return {
cartridges,
cassettes,
rates: buildRates(tickers),
balances: buildBalances(balances),
currentConfigVersion
@ -194,10 +194,10 @@ function plugins (settings, deviceId) {
function dispenseAck (tx) {
const config = configManager.machineScoped(deviceId, settings.config)
const cartridges = [ config.topCashOutDenomination,
const cassettes = [ config.topCashOutDenomination,
config.bottomCashOutDenomination ]
return dbm.addDispense(deviceId, tx, cartridges)
return dbm.addDispense(deviceId, tx, cassettes)
}
function fiatBalance (fiatCode, cryptoCode) {
@ -517,9 +517,9 @@ function plugins (settings, deviceId) {
// However, we should make all config changes atomic in the future.
const config = configManager.machineScoped(deviceId, settings.config)
const topCashOutDenomination = config.topCashOutDenomination -
(tx.bills[0].actualDispense + tx.bills[0].rejected)
(tx.bills[0].dispensed + tx.bills[0].rejected)
const bottomCashOutDenomination = config.bottomCashOutDenomination -
(tx.bills[1].actualDispense + tx.bills[1].rejected)
(tx.bills[1].dispensed + tx.bills[1].rejected)
const newFields = [
{
@ -575,7 +575,7 @@ function plugins (settings, deviceId) {
sweepHd,
sendMessage,
checkBalances,
buildCartridges,
buildCassettes,
updateCassettes,
buy,
sell