Merge branch 'develop' into 'master'

fix version-test See merge request in3/c/in3-core!332
blockchainsllc · Aug 16, 2020 · 828fbdb · 828fbdb
2 parents 2848e6e + ed4bcf6
commit 828fbdb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ project(in3)
 
 # options
 option(BUILD_DOC "generates the documenation with doxygen." OFF)
-option(TAG_VERSION "the tagged version, which should be used" 2.0.0)
+option(TAG_VERSION "the tagged version, which should be used" 3.0.0)
 option(ETH_NANO "build minimal eth verification.(eth_getTransactionReceipt)" ON)
 option(ETH_BASIC "build basic eth verification.(all rpc-calls except eth_call)" ON)
 option(ETH_FULL "build full eth verification.(including eth_call)" ON)
@@ -182,7 +182,7 @@ endif()
 if (TAG_VERSION)
    set(PROJECT_VERSION "${TAG_VERSION}")
 else(TAG_VERSION)
-   set(PROJECT_VERSION "2.2.2-local")
+   set(PROJECT_VERSION "3.0.0-local")
 endif(TAG_VERSION)
 
 MESSAGE(STATUS "Building version ${PROJECT_VERSION}")

diff --git a/wasm/test/testUtil.js b/wasm/test/testUtil.js
@@ -99,7 +99,7 @@ describe('Util-Tests', () => {
 
     it('getVersion', async () => {
         const res = IN3.util.getVersion()
-        assert.match(res, /2\.[0-9]+\.[0-9]+/)
+        assert.match(res, /3\.[0-9]+\.[0-9]+/)
     })
 
     it('getAddress', async () => {