Bitcoin-com / rest.bitcoin.com

69%

master: 67%

LAST BUILD ON BRANCH ct-fix-merge-conflict

branch: ct-fix-merge-conflict

CHANGE BRANCH

x

Reset

• ct-fix-merge-conflict
• ct-coveralls
• stage
• ct-tests
• ct-tests-unstable
• old-tests
• master
• wormhole-merge2
• local-server-test
• stage-working
• ct-qa
• ct-travis-test
• 1.9.1
• ct-try-deploy
• ct-get-stage-working
• ct-sync-master-and-stage
• rest-v2
• all-slp-tokens
• v2-updates
• ct-address-refactor
• ct-fix-crowdsale
• ct-v2-address
• ct-v2-network-detect
• ct-v2-testnet-tests
• ct-v2-block
• 1.9.6
• preserve-stage
• rollback-stage
• tmp-stage
• cgc-v2-address
• 1.10.0
• wormhole-balance
• pre-stage
• 1.10.3
• panda-uppdates
• 1.10.4
• 1.10.5
• ct-v2-control
• ct-no-compiled-code
• add-travis
• add-lock
• remove-transpiled-code
• ERC721
• 1.12.1
• ct-v2-blockchain
• ct-v2-dataretrieval
• ct-v2-rawtransactions
• ct-tmp-01
• add-greenkeeper
• ct-fix-deps
• ct-v2-misc
• ct-v2-payload
• 1.12.2
• ct-sem-release
• ct-two-endpoints
• wormhole-tx
• ct-swagger-v2
• v1.0.0
• v1.12.3
• v1.13.0
• break-swagger-apart
• ct-swagger-v2-pt1
• fix-rate-limits
• paging
• set-env-var-examples
• cc-swagger-post
• ct-fix-txout
• v1.14.0
• payload-creation-v2
• ct-swagger-v2-testnet
• input-validation
• ct-fix-getrawtransaction
• wh-no-tx-fix
• rest-v2-updates
• ct-bulk-tests
• ct-bulk-tests2
• update-bchsocketd
• update-socket-dep
• v1.14.1
• slp-v2
• ct-slp-v2
• ct-fix-500-unit-tests
• validate-slp
• ct-fix-unconfirmed
• ct-v2-rawtransaction-bulk
• slp-validate-remote
• redeploy
• bump-major-version
• 2.0.0
• v1.14.2
• update-output
• 2.0.1
• 2.0.2
• ct-send-rawtransactions
• ct-send-rawtransactions-parallel-not-working
• update-engines
• v1.14.3
• 2.0.3
• ct-transaction-detail-bulk-refactor
• 2.0.4
• v1.14.4
• fix-typo
• 2.0.5
• add-v2-route
• 2.0.6
• ct-fix-address-tests
• getrawtransactions-swagger
• getrawtx
• 2.0.7
• local-validate
• ct-fix-stage
• leveldb
• leveldb-test
• update-slp-list
• 2.1.0
• port-over-changes
• stage-restore-slp
• add-mocha
• 2.1.2
• updatePath
• 2.1.3
• ct-slp-unit-tests
• updateslpjs
• updateName
• addSLPProperties
• fromxpub
• 2.1.6
• 2.1.7
• v1.14.5
• ct-fix-stage-slp
• remove-wormhole
• 2.2.0
• check-if-address-exists
• v1.14.6
• 2.2.1
• convert-slp-addr
• 2.2.2
• slp-balances
• 2.2.3
• v2-merge-ratelimit
• remove-omni
• slp-balances-cache
• 2.2.5
• update-slp-address
• 2.2.6
• ct-sendrawtransaction
• update-swagger
• 2.2.7
• ct-slp-bulk-convert
• ct-bulk-decode
• 2.3.0
• ct-slp-tokens-bulk
• 2.3.1
• ct-token-transfer
• ct-token-transfer2
• slp-functionality
• 2.4.0
• ct-fix-slp-unit-tests
• conditional-address-format
• 2.4.1
• slp-balance-update
• slp-validate-single
• update-slpjs
• 3.0.0
• ct-pro-rate-limits
• slpdb-integration
• v1.14.7
• 3.1.0
• addresses-by-tokenid
• transactions-by-address-and-tokenid
• 3.2.0
• revert-335-ct-pro-rate-limits
• 3.2.2
• ct-rate-limit-errors
• ct-local-logging
• revert-358-ct-local-logging
• ct-local-logging2
• cgc-slpdb-updates
• ct-expand-logs
• rollback-validate
• rollback-balances
• preserve-slp-balances
• revert-372-rollback-balances
• integration-tests
• ct-multi-pro-tier
• ct-tweek-error-logs
• ct-fix-slp-tests
• feat/optional-zmq
• ct-merge-master
• ct-vout-cashaddr
• ct-fix-slp
• 3.3.7
• ct-tweek-logs
• version-bump
• 3.3.8
• ct-fix-404
• ct-jwt-auth
• ct-fix-398
• SpendBCH-patch-1
• readme-update
• ct-slp-logs
• fix-bulk-requests
• v3.4.0
• typescript
• v3.6.0
• ct-rate-limit-test
• v3.6.1
• remove-slpjs
• v3.7.0
• ct-token-tx-details-test
• ct-mock-token-tx-details
• burnTotal
• v3.8.0
• ct-remove-pro-tier-logging
• v3.8.1
• v3.9.0
• revert-425-stage
• revert-427-stage
• revert-428-revert-427-stage
• revert-429-revert-428-revert-427-stage
• v3.9.1
• feat/token-balance-string
• remove-v1
• v3.10.0
• v3.10.1
• remove-socket
• debug-websockets
• v3.11.0
• testing-websockets-on-stage
• revert-446-testing-websockets-on-stage
• revert-445-testing-websockets-on-stage
• bring-back-v1
• v3.11.1
• ct-ip-addr
• ct-better-logging
• ct-v3
• v3.11.2
• reenable-ws
• revert-461-reenable-ws
• revert-462-revert-461-reenable-ws
• update-example
• rebranding
• v3.11.5
• ct-event-loop
• favicon-update
• v3.11.6
• v3.11.7
• ct-unit-tests
• ct-getnetworkinfo
• v3.11.8
• v3.11.9
• remove-ws
• v3.12.0
• revert-481-stage
• slp-facts-bulk
• slp-networking-errors
• issue-390
• v3.12.1
• bulkBalancesForAddress
• bulk-slp-burn-total
• balances-for-tokenid-bulk
• slp-balance-address-tokenId
• slp-transactions
• ca-lookup-bulk
• v3.12.2
• sample-data
• v3.12.3
• ct-fix-test
• add_asm
• slp-rest
• ct-slpdb-validation
• slpdb-validation
• ct-pswd-slpserve
• ct-rollback-test
• ct-more-tests
• ct-fix-validatetxid
• ct-fix-integration-tests
• ct-fix-txdetails
• ct-temp
• ct-reduce-error-logs
• ct-stateless
• axios-timeout
• slpdb-queries
• ct-newV3
• slpdb-queries-v3
• v3/slpdb-queries
• v3/swagger-update
• ct-fix-slp-timeout
• slpdata-service
• ct-fix-logs
• ct-v3-address-balance
• slp-tx-history-endpoints
• update/slp-tx-history
• ct-v3-address-utxo
• spendbch/slp-indexer
• remove-chat-link
• fix/incorrect-query-param-type
• sunset-notice
• fullstack-notice
• feature/additional-replacements

Build # 259

Build Type

Pull #40

travis-ci

Committed by web-flow

Commit Message

Fixing merge conflict

Pull Request Pull Request #40: This should fix the merge conflict in stage.

Run Details

54 of 104 branches covered (51.92%)

Branch coverage included in aggregate %.

7 of 7 new or added lines in 1 file covered. (100.0%)

728 of 1024 relevant lines covered (71.09%)

2.88 hits per line