This repository has been archived by the owner on Jun 8, 2020. It is now read-only.
Bitmex misc merge #329
Merged
Bitmex misc merge #329
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-reports' into bitmex-merge # Conflicts: # xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexManualExample.java
# Conflicts: # pom.xml # service-core/pom.xml # service-netty/pom.xml # service-netty/src/main/java/info/bitrich/xchangestream/service/netty/JsonNettyStreamingService.java # service-netty/src/main/java/info/bitrich/xchangestream/service/netty/NettyStreamingService.java # service-pubnub/pom.xml # service-pusher/pom.xml # service-wamp/pom.xml # xchange-binance/pom.xml # xchange-binance/src/main/java/info/bitrich/xchangestream/binance/BinanceStreamingExchange.java # xchange-bitfinex/pom.xml # xchange-bitfinex/src/main/java/info/bitrich/xchangestream/bitfinex/BitfinexStreamingExchange.java # xchange-bitflyer/pom.xml # xchange-bitmex/pom.xml # xchange-bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingExchange.java # xchange-bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingMarketDataService.java # xchange-bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingService.java # xchange-bitstamp/pom.xml # xchange-bitstamp/src/main/java/info/bitrich/xchangestream/bitstamp/dto/BitstampWebSocketTransaction.java # xchange-cexio/pom.xml # xchange-coinbasepro/pom.xml # xchange-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingMarketDataService.java # xchange-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProStreamingService.java # xchange-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketTransaction.java # xchange-coinbasepro/src/main/java/info/bitrich/xchangestream/coinbasepro/netty/WebSocketClientCompressionAllowClientNoContextHandler.java # xchange-coinbasepro/src/test/java/info/bitrich/xchangestream/coinbasepro/CoinbaseProManualExample.java # xchange-coinbasepro/src/test/java/info/bitrich/xchangestream/coinbasepro/dto/CoinbaseProWebSocketSubscriptionMessageTest.java # xchange-coinbasepro/src/test/resources/log4j2.xml # xchange-coinmate/pom.xml # xchange-gdax/pom.xml # xchange-gdax/src/test/resources/log4j2.xml # xchange-gemini/pom.xml # xchange-hitbtc/pom.xml # xchange-hitbtc/src/main/java/info/bitrich/xchangestream/hitbtc/HitbtcStreamingExchange.java # xchange-okcoin/pom.xml # xchange-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingExchange.java # xchange-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingMarketDataService.java # xchange-okcoin/src/main/java/info/bitrich/xchangestream/okcoin/OkCoinStreamingService.java # xchange-okcoin/src/test/java/info/bitrich/xchangestream/okcoin/OkExFuturesManualExample.java # xchange-okex-v3/pom.xml # xchange-okex-v3/src/test/resources/log4j2.xml # xchange-poloniex/pom.xml # xchange-poloniex2/pom.xml # xchange-stream-core/pom.xml # xchange-stream-core/src/main/java/info/bitrich/xchangestream/core/StreamingExchange.java # xchange-wex/pom.xml
badgerwithagun
suggested changes
Jun 16, 2019
There was a problem hiding this comment.
Thankyou so much for helping out with this, @henryxwong.
I've worked through and found a few remaining issues (mostly it's the same issue repeated). Any chance you could take a look at those?
Once those changes are in, I think I'm just going to merge and let you and the other users of Bitmex fix from there. There's no point delaying further waiting for Bitmex reviewers to come forward.
...bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingMarketDataService.java
Outdated
Show resolved
Hide resolved
...bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingMarketDataService.java
Outdated
Show resolved
Hide resolved
...bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingMarketDataService.java
Outdated
Show resolved
Hide resolved
xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java
Show resolved
Hide resolved
xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexDeadManSwitchTest.java
Outdated
Show resolved
Hide resolved
xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexOrderReplaceTest.java
Outdated
Show resolved
Hide resolved
xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexOrderReplaceTest.java
Show resolved
Hide resolved
xchange-bitmex/src/test/java/info/bitrich/xchangestream/bitmex/BitmexOrderReplaceTest.java
Show resolved
Hide resolved
xchange-stream-core/src/main/java/info/bitrich/xchangestream/core/StreamingTradeService.java
Outdated
Show resolved
Hide resolved
xchange-bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingTradeService.java
Outdated
Show resolved
Hide resolved
|
Resolves #244 |
badgerwithagun
added
bitmex_delayed
… bitmex-merge # Conflicts: # xchange-bitmex/src/main/java/info/bitrich/xchangestream/bitmex/BitmexStreamingExchange.java
| @@ -62,13 +58,13 @@ public void testDeadmanSwitch() throws Exception { | |||
|
|
|||
| final BitmexStreamingMarketDataService streamingMarketDataService = (BitmexStreamingMarketDataService) exchange.getStreamingMarketDataService(); | |||
| // streamingMarketDataService.authenticate(); | |||
| CurrencyPair xbtUsd = CurrencyPair.XBT_USD; | |||
| CurrencyPair xbtUsd = exchange.determineActiveContract(CurrencyPair.XBT_USD.base.toString(), CurrencyPair.XBT_USD.counter.toString(), PERPETUAL); | |||
There was a problem hiding this comment.
determineActiveContract takes "BTC" rather than "XBT" I think (or should do)...
There was a problem hiding this comment.
Ah no, works with either. Cool.
badgerwithagun
approved these changes
Jun 17, 2019
|
Thanks for those changes. @henryxwong. OK, as discussed, I'm going to merge this then move onto the next Bitmex PR. Could you do me a favour and tell me which PRs you got these changes from, and what you omitted? Then I can close those and open fresh PRs for the remaining changes which you didn't include. E2A: looks like GitHub closed then automatically. Nothing to worry about. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge changes from forks created by badgerwithagun and declan94
Since the branch from declan94 is too dated, I only hand picked Bitmex related changes.