这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 1.8.0
- feature: Weighted Averages model

# 1.7.1
- fix: Change FundingOffer, Order, Position model to support new rest api signature
- fix: Test coverage to support new rest api signature
Expand Down
4 changes: 2 additions & 2 deletions docs/AccountSummary.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Alert.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/AuthPermission.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/BalanceInfo.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Candle.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/ChangeLog.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/CoreSettings.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Currency.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingCredit.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingInfo.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingLoan.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingOffer.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingTicker.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingTickerHist.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/FundingTrade.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Invoice.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/LedgerEntry.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Liquidations.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Login.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/MarginInfo.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Model.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Movement.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/MovementInfo.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Notification.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Order.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/OrderBook.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Position.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/PublicPulseProfile.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/PublicTrade.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/PulseMessage.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/StatusMessagesDeriv.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/SymbolDetails.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Trade.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/TradingTicker.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/TradingTickerHist.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/TransactionFee.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/UserInfo.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/Wallet.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/WalletHist.html

Large diffs are not rendered by default.

771 changes: 771 additions & 0 deletions docs/WeightedAverages.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/account_summary.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/alert.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/auth_permission.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/balance_info.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/candle.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/change_log.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/core_settings.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/currency.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_credit.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_info.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_loan.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_offer.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_ticker.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_ticker_hist.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/funding_trade.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/global.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/index.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/invoice.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/ledger_entry.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/liquidations.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/login.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/margin_info.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/model.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/movement.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/movement_info.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/notification.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/order.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/order_book.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/position.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/public_pulse_profile.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/public_trade.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/pulse_message.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/status_messages_deriv.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/symbol_details.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/trade.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/trading_ticker.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/trading_ticker_hist.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/transaction_fee.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/user_info.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/util_assign_from_collection_or_instance.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/util_is_collection.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_amount.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_array.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_bool.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_currency.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_date.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_number.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_object.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_price.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_string.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/validators_symbol.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/wallet.js.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/wallet_hist.js.html

Large diffs are not rendered by default.

137 changes: 137 additions & 0 deletions docs/weighted_averages.js.html

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ module.exports = {
AccountSummary: require('./account_summary'),
AuthPermission: require('./auth_permission'),
CoreSettings: require('./core_settings'),
WeightedAverages: require('./weighted_averages'),

isCollection: require('./util/is_collection')
}
64 changes: 64 additions & 0 deletions lib/weighted_averages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
'use strict'

const numberValidator = require('./validators/number')
const Model = require('./model')
const fields = {
tradeCount: 0,
sumBuyingSpent: 1,
sumBuyingAmount: 2,
sumSellingSpent: 4,
sumSellingAmount: 5,
buyingWeightedPrice: 7,
sellingWeightedPrice: 8
}

/**
* Weighted Averages model
*/
class WeightedAverages extends Model {
/**
* @param {object|Array} data - weighted averages data
* @param {number} data.tradeCount - trade count
* @param {number} data.sumBuyingSpent - sum buying spent
* @param {number} data.sumBuyingAmount - sum buying amount
* @param {number} data.sumSellingSpent - sum selling spent
* @param {number} data.sumSellingAmount - sum selling amount
* @param {number} data.buyingWeightedPrice - buying weighted price
* @param {number} data.sellingWeightedPrice - selling weighted price
*/
constructor (data = {}) {
super({ data, fields })
}

/**
* @param {object[]|object|Array[]|Array} data - data to convert to POJO
* @returns {object} pojo
*/
static unserialize (data) {
return super.unserialize({ data, fields })
}

/**
* Validates a given WeightedAverages instance
*
* @param {object[]|object|WeightedAverages[]|WeightedAverages|Array} data - instance to validate
* @returns {string} error - null if instance is valid
*/
static validate (data) {
return super.validate({
data,
fields,
validators: {
tradeCount: numberValidator,
sumBuyingSpent: numberValidator,
sumBuyingAmount: numberValidator,
sumSellingSpent: numberValidator,
sumSellingAmount: numberValidator,
buyingWeightedPrice: numberValidator,
sellingWeightedPrice: numberValidator
}
})
}
}

module.exports = WeightedAverages
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bfx-api-node-models",
"version": "1.7.1",
"version": "1.8.0",
"description": "Object models for usage with the Bitfinex node API",
"engines": {
"node": ">=8.3.0"
Expand Down
30 changes: 30 additions & 0 deletions test/lib/models/weighted_averages.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//* eslint-env mocha */
'use strict'

const { WeightedAverages } = require('../../../lib')
const testModel = require('../../helpers/test_model')
const testModelValidation = require('../../helpers/test_model_validation')

describe('WeightedAverages model', () => {
testModel({
model: WeightedAverages,
orderedFields: [
'tradeCount', 'sumBuyingSpent', 'sumBuyingAmount', null,
'sumSellingSpent', 'sumSellingAmount', null,
'buyingWeightedPrice', 'sellingWeightedPrice'
]
})

testModelValidation({
model: WeightedAverages,
validData: {
tradeCount: new Array(...(new Array(5))).map(() => Math.random()),
sumBuyingSpent: new Array(...(new Array(5))).map(() => Math.random()),
sumBuyingAmount: new Array(...(new Array(5))).map(() => Math.random()),
sumSellingSpent: new Array(...(new Array(5))).map(() => Math.random()),
sumSellingAmount: new Array(...(new Array(5))).map(() => Math.random()),
buyingWeightedPrice: new Array(...(new Array(5))).map(() => Math.random()),
sellingWeightedPrice: new Array(...(new Array(5))).map(() => Math.random())
}
})
})