Close #195, Fix maven build issues (#196)

ebrahimmfadae · web-flow · commit a05ebb11e2b1 · 2022-02-08T11:38:55.000+03:30
* Fix matching-engine test package names

* Change vault config address

* Fix docker-compose command in jenkins

* Fix bc-gateway VAULT_HOST
diff --git a/dev.Jenkinsfile b/dev.Jenkinsfile
@@ -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'
             }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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}
@@ -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
diff --git a/matching-engine/matching-engine-app/src/test/kotlin/co/nilin/opex/matching/engine/app/OrderBookEventEmitsUnitTest.kt b/matching-engine/matching-engine-app/src/test/kotlin/co/nilin/opex/matching/engine/app/OrderBookEventEmitsUnitTest.kt
@@ -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
@@ -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() {
@@ -144,6 +145,4 @@ class OrderBookEventEmitsUnitTest {
         //then
         Assertions.assertNotNull(persistentOrderBook)
     }
-
-
 }
diff --git a/matching-engine/matching-engine-core/src/test/kotlin/co/nilin/opex/matching/engine/core/SimpleOrderBookUnitTest.kt b/matching-engine/matching-engine-core/src/test/kotlin/co/nilin/opex/matching/engine/core/SimpleOrderBookUnitTest.kt
@@ -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
@@ -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() {
@@ -848,5 +849,4 @@ class SimpleOrderBookUnitTest {
         Assertions.assertNotNull(orderBook.bestBidOrder)
         Assertions.assertNotNull(orderBook.bestAskOrder)
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ pipeline {`
`24`	`24`	`DEFAULT_NETWORK_NAME = 'dev-opex'`
`25`	`25`	`}`
`26`	`26`	`steps {`
`27`		`- sh 'docker-compose up -f docker-compose.yml -f docker-compose.dev.yml -d --build --remove-orphans'`
	`27`	`+ sh 'docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d --build --remove-orphans'`
`28`	`28`	`sh 'docker image prune -f'`
`29`	`29`	`sh 'docker network prune -f'`
`30`	`30`	`}`