Skip to content

Close #195, Fix maven build issues #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebrahimmfadae merged 4 commits into from
Feb 8, 2022
Merged

Close #195, Fix maven build issues #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6e4184
Fix matching-engine test package names
ebrahimmfadae Feb 7, 2022
a087177
Change vault config address
ebrahimmfadae Feb 7, 2022
db3acb1
Fix docker-compose command in jenkins
ebrahimmfadae Feb 7, 2022
477879d
Fix bc-gateway VAULT_HOST
ebrahimmfadae Feb 7, 2022
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
2 changes: 1 addition & 1 deletion dev.Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pipeline {
DEFAULT_NETWORK_NAME = 'dev-opex'
}
steps {
sh 'docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans'
sh 'docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build --remove-orphans'
sh 'docker image prune -f'
sh 'docker network prune -f'
}
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
image: vault
volumes:
- $DATA/vault:/vault/file:rw
- $PWD/vault/config:/vault/config:rw
- ./vault/config:/vault/config:rw
environment:
- VAULT_ADDRESS=http://0.0.0.0:8200
- PANEL_PASS=${PANEL_PASS}
Expand Down Expand Up @@ -401,7 +401,7 @@ services:
- CONSUL_HOST=consul
- DB_IP_PORT=postgres-bc-gateway
- BACKEND_USER=${BACKEND_USER}
- VAULT_URL=http://vault:8200
- VAULT_HOST=vault
depends_on:
- redis
- consul
Expand Down
11 changes: 5 additions & 6 deletions ...re/engine/OrderBookٍEventEmitsUnitTest.kt → ...engine/app/OrderBookEventEmitsUnitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package co.nilin.opex.matching.engine.core.engine
package co.nilin.opex.matching.engine.app

import co.nilin.opex.matching.engine.core.engine.SimpleOrderBook
import co.nilin.opex.matching.engine.core.eventh.EventDispatcher
import co.nilin.opex.matching.engine.core.eventh.events.OrderBookPublishedEvent
import co.nilin.opex.matching.engine.core.inout.OrderCancelCommand
Expand All @@ -15,10 +16,10 @@ import org.junit.jupiter.api.Test
import java.util.*

class OrderBookEventEmitsUnitTest {
val pair = co.nilin.opex.matching.engine.core.model.Pair("BTC", "USDT")
val uuid = UUID.randomUUID().toString()
private val pair = co.nilin.opex.matching.engine.core.model.Pair("BTC", "USDT")
private val uuid = UUID.randomUUID().toString()

var persistentOrderBook: PersistentOrderBook? = null
private var persistentOrderBook: PersistentOrderBook? = null

@BeforeEach
fun setup() {
Expand Down Expand Up @@ -144,6 +145,4 @@ class OrderBookEventEmitsUnitTest {
//then
Assertions.assertNotNull(persistentOrderBook)
}


}
10 changes: 5 additions & 5 deletions ...ng/core/engine/SimpleOrderBookUnitTest.kt → ...ng/engine/core/SimpleOrderBookUnitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package co.nilin.opex.matching.engine.core.engine
package co.nilin.opex.matching.engine.core

import co.nilin.opex.matching.engine.core.engine.SimpleOrderBook
import co.nilin.opex.matching.engine.core.inout.OrderCancelCommand
import co.nilin.opex.matching.engine.core.inout.OrderCreateCommand
import co.nilin.opex.matching.engine.core.inout.OrderEditCommand
Expand All @@ -13,9 +14,9 @@ import org.junit.jupiter.api.Test
import java.util.*

class SimpleOrderBookUnitTest {
val pair = co.nilin.opex.matching.engine.core.model.Pair("BTC", "USDT")
val ETH_BTC_PAIR = co.nilin.opex.matching.engine.core.model.Pair("ETH", "BTC")
val uuid = UUID.randomUUID().toString()
private val pair = co.nilin.opex.matching.engine.core.model.Pair("BTC", "USDT")
private val ETH_BTC_PAIR = co.nilin.opex.matching.engine.core.model.Pair("ETH", "BTC")
private val uuid = UUID.randomUUID().toString()

@Test
fun givenEmptyOrderBook_whenGtcBidLimitOrderCreated_then1BucketWithSize1() {
Expand Down Expand Up @@ -848,5 +849,4 @@ class SimpleOrderBookUnitTest {
Assertions.assertNotNull(orderBook.bestBidOrder)
Assertions.assertNotNull(orderBook.bestAskOrder)
}

}