Merge pull request #288 from FISCO-BCOS/revert-287-release-2.0.0-rc3

Revert "Release 2.0.0 rc3"
FISCO-BCOS · May 30, 2019 · 918386b · 918386b
2 parents 29ac035 + 9eb91a0
commit 918386b
Show file tree

Hide file tree

Showing 583 changed files with 36,713 additions and 40,874 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,67 @@
+# Java Gradle CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-java/ for more details
+#
+version: 2
+jobs:            
+  build:
+    working_directory: ~/web3sdk
+    branches:
+      only: 
+        - master
+        - /release-2.*/
+    tags:
+      only: 
+        - /v2.*/
+    docker:
+      # specify the version you desire here
+      - image: circleci/openjdk:8-jdk
+        environment:
+          POSTGRES_USER: root
+    environment:
+      # Customize the JVM maximum heap limit
+      JVM_OPTS: -Xmx3200m
+      TERM: dumb
+
+    steps:
+
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "build.gradle" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      # build blockchian by build_chain.sh
+      - run: 
+            name: fisco-bcos
+            command: |
+              sudo apt-get update 
+              sudo apt install -y openssl curl
+              curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/build_chain.sh && chmod u+x build_chain.sh
+              bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh) -b master
+              ./bin/fisco-bcos -v
+              ./build_chain.sh -e bin/fisco-bcos -l "127.0.0.1:4" -p 30300,20200,8545
+              cd nodes/127.0.0.1
+              ./start_all.sh
+
+      - run: gradle dependencies
+
+      - save_cache:
+          paths:
+            - ~/web3sdk/.gradle
+          key: v1-dependencies-{{ checksum "build.gradle" }}
+
+      # run integration test for sdk
+      - run:
+          name: sdk
+          command: |
+            cp nodes/127.0.0.1/sdk/* src/test/resources/
+            gradle test
+      - run:
+          name: Upload Coverage
+          command: |
+            gradle jacocoTestReport
+            bash <(curl -s https://codecov.io/bash)
diff --git a/.gitignore b/.gitignore
@@ -39,5 +39,3 @@ gradle.properties
 /src/test/resources/node.key
 /src/test/java/org/fisco/bcos/temp
 build.gradle.bak
-/.settings/
-.project
diff --git a/.travis.yml b/.travis.yml
@@ -1,18 +1,15 @@
 # safelist
 branches:
-  only:
-      - /.*/
-
-matrix:
-  fast_finish: true
-  include:
-      - os: linux
-        dist: xenial
-        sudo: required
+  only: 
+    - master
+    - /release-2.*/
+tags:
+  only: 
+    - /v2.*/
 
 language: java
 jdk:
-  - openjdk8
+  - oraclejdk8
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -26,16 +23,9 @@ cache:
 before_install:
   - gradle wrapper
 
-script: |
-  curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/release-2.0.0-rc3/tools/build_chain.sh && chmod u+x build_chain.sh
-  bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/master/tools/ci/download_bin.sh) -b release-2.0.0-rc3
-  echo "127.0.0.1:4 agency1 1,2,3" > ipconf
-  ./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.0.0-rc3
-  ./nodes/127.0.0.1/start_all.sh
-  ./nodes/127.0.0.1/fisco-bcos -v
-  cp nodes/127.0.0.1/sdk/* src/integration-test/resources/
-  mv src/integration-test/resources/applicationContext-sample.xml src/integration-test/resources/applicationContext.xml
-  ./gradlew verifyGoogleJavaFormat
-  ./gradlew build
-  ./gradlew test
-  ./gradlew integrationTest
+script: 
+  - ./gradlew build -x test
+  - ./gradlew jacocoTestReport
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -40,18 +40,6 @@ Go to [issues page](https://github.com/FISCO-BCOS/web3sdk/issues)
 7. Wait the community to review the code
 8. Merged !!!!
 
-## Code formatting
-
-The code formatting tool are described by the [google-java-format-gradle-plugin](https://github.com/sherter/google-java-format-gradle-plugin).
-
-Execute the task `googleJavaFormat` to format all *.java files in the project
-```
-./gradlew goJF
-```
-Execute the task `verifyGoogleJavaFormat` to verify that all *.java files are formatted properly
-```          
-./gradlew verGJF
-```
 
 ## Continous integration
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,36 +1,16 @@
-### v2.0.0-rc3
-
-(2019-05-28)
-
-增加
-1. 提供CRUDService类，包含操作用户表的CRUD接口。
-2. 提供加载账号文件的工具管理类PEMManager和P12Manager，可以分别加载PEM格式和PKCS12格式的账戶文件。
-3. 增加集成测试，覆盖web3j api和precompile api。
-
-更新
-1. 优化日志格式，调整日志输出内容，可以更详细显示交易流程信息。
-2. 优化选择节点块高最大的节点发送交易。
-3. 支持多群组区块链前置配置。
-4. SDK配置文件中，机构属性字段修改为agencyName。
-
-* Compatibility
-
-1. 兼容rc1，rc2, rc3的节点
-
-
 ### v2.0.0-rc2
 
 (2019-04-25)
 
-* 增加
+* Add
 
 1. 可并行合约开发框架ParallelContract.sol
 2. 并行预编译转账合约DagTransferPrecompiled的压测程序
 3. 并行solidity转账合约parallelOk的压测程序
 4. CRUD合约的压测程序
 5. 回滚合约的压测程序
 
-* 更新
+* Update
 
 1. 在交易编码中加入chainID和groupID，以支持rc2节点的交易格式
 2. sol转java，在java文件中增加了abi字段。
@@ -43,19 +23,15 @@
 
 (2019-03-18)
 
-* 增加 
+* Add 
 
 1. 提供多群组支持
 2. 提供Spring Boot配置以及demo项目
 3. 提供模块化的单元测试，新增使用示例
 4. 增加Precompiled Service接口，实现对区块链相关配置的管理，及实现特定预编译合约的功能
 
-* 更新
+* Update
 
 1. 同步以太坊最新代码，支持动态数组返回，支持最新0.5.x合约
 2. 优化合约编译流程，无需下载solcj即可直接编译合约生成abi bin和java合约文件
 3. 升级Web3j，修改Web3j接口名
-
-* Compatibility
-
-1. 兼容rc1的节点
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,11 @@
-plugins {
-  id 'com.github.sherter.google-java-format' version '0.8'
-}
 
 apply plugin: 'maven'
 apply plugin: 'idea'
 apply plugin: 'java'
 apply plugin: 'eclipse'
 apply plugin: 'signing'
-apply plugin: 'application'
+apply plugin:'application'
+apply plugin: 'jacoco'
 
 
 sourceCompatibility = 1.8
@@ -17,23 +15,13 @@ targetCompatibility = 1.8
 
 // In this section you declare where to find the dependencies of your project
 repositories {
-    maven { url "http://maven.aliyun.com/nexus/content/groups/public/" }
-	  maven { url 'https://dl.bintray.com/ethereum/maven/' }
+    maven {
+        url "http://maven.aliyun.com/nexus/content/groups/public/"
+    }
+	maven { url 'https://dl.bintray.com/ethereum/maven/' }
     mavenCentral()
 }
 
-googleJavaFormat {
-  options style: 'AOSP'
-  source = sourceSets*.allJava
-  include '**/*.java'
-  exclude '**/temp/*.java'
-}
-
-verifyGoogleJavaFormat {
-  source = sourceSets*.allJava
-  include '**/*.java'
-  exclude '**/temp/*.java'
-}
 
 def spring_version="4.3.18.RELEASE"
 
@@ -56,44 +44,39 @@ List alibaba = [
 
 // In this section you declare the dependencies for your production and test code
 dependencies {
-   // compile files('lib/solcJ-all-0.4.25-gm.jar')
-   // compile 'org.ethereum:solcJ-all:0.5.2'
-	compile 'org.ethereum:solcJ-all:0.4.25'
-	compile logger,spring,alibaba
-	compile 'org.apache.commons:commons-lang3:3.1'
-	compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
-	compile 'io.netty:netty-all:4.1.32.Final'
+// compile files('lib/solcJ-all-0.4.25-gm.jar')
+	//compile	'org.ethereum:solcJ-all:0.5.2'
+	compile	'org.ethereum:solcJ-all:0.4.25'
+    compile logger,spring,alibaba
+    compile 'org.apache.commons:commons-lang3:3.1'
+    compile "com.fasterxml.jackson.core:jackson-databind:2.9.6"
+    compile 'io.netty:netty-all:4.1.32.Final'
 	compile 'io.netty:netty-tcnative:2.0.20.Final'
 	compile 'io.netty:netty-tcnative-boringssl-static:2.0.20.Final'
 	compile 'com.google.guava:guava:19.0'
 	compile 'commons-configuration:commons-configuration:1.10'
-	 // web3j
-	compile 'org.apache.httpcomponents:httpclient:4.5.5',
+
+   	// web3j
+   	compile 'org.apache.httpcomponents:httpclient:4.5.5',
             'org.bouncycastle:bcprov-jdk15on:1.54',
             'com.lambdaworks:scrypt:1.4.0',
             'com.squareup:javapoet:1.7.0',
             'io.reactivex:rxjava:1.2.4',
-            'io.reactivex.rxjava2:rxjava:2.2.2',
-            'com.github.jnr:jnr-unixsocket:0.15',
-            'info.picocli:picocli:3.6.0',
-            'org.java-websocket:Java-WebSocket:1.3.8',
-            'org.apache.commons:commons-collections4:4.0',
-            'commons-io:commons-io:2.4',
-            'com.github.stefanbirkner:system-rules:1.18.0',
-            'junit:junit:4.12',
-            'org.mockito:mockito-core:2.23.0'
-	compile 'de.vandermeer:asciitable:0.3.2'
+			"io.reactivex.rxjava2:rxjava:2.2.2",
+			'com.github.jnr:jnr-unixsocket:0.15',
+	        'info.picocli:picocli:3.6.0',
+			"org.java-websocket:Java-WebSocket:1.3.8",
+	 		"org.apache.commons:commons-collections4:4.0",
+			"commons-io:commons-io:2.4",
+			'com.github.stefanbirkner:system-rules:1.18.0',
+	  		'junit:junit:4.12',
+			'org.mockito:mockito-core:2.23.0'
 }
 
-//archivesBaseName = 'web3sdk'
-//group = 'org.fisco-bcos'
-//version = '2.0.2'
+archivesBaseName = 'web3sdk'
+group = 'org.fisco-bcos'
+version = '2.0.2'
 
-configurations {
-    integrationTestCompile.extendsFrom testCompile
-    integrationTestRuntime.extendsFrom testRuntime
-}
-
 // for old sdk
 sourceSets {
 	main {
@@ -105,29 +88,8 @@ sourceSets {
 			srcDir 'src/test/resources'
 		}
 	}
-	integrationTest {
-        java {
-            compileClasspath += main.output + test.output
-            runtimeClasspath += main.output + test.output
-            srcDir file('src/integration-test/java')
-        }
-        resources.srcDir file('src/integration-test/resources')
-    }
 }
 
-task integrationTest(type: Test) {
-    testClassesDirs = sourceSets.integrationTest.output.classesDirs
-    classpath = sourceSets.integrationTest.runtimeClasspath
-    outputs.upToDateWhen { false }
-}
-
-check.dependsOn integrationTest
-integrationTest.mustRunAfter test
-
-check.dependsOn.remove(test)
-check.dependsOn.remove(integrationTest)
-check.dependsOn.remove(verifyGoogleJavaFormat)
-
 //  1 dist jar
 jar {
 	destinationDir file('dist/apps')
@@ -224,4 +186,14 @@ test {
 //		}
 //	}
 //}
+
+jacocoTestReport {
+    reports {
+        xml.enabled true
+        html.enabled false
+    }
+}
+
+check.dependsOn jacocoTestReport
+
 mainClassName  = System.getProperty("exec.mainClass") ?:  "org.fisco.bcos.channel.test.amop.Channel2Client"
diff --git a/doc/CONTRIBUTING_CN.md b/doc/CONTRIBUTING_CN.md
@@ -40,19 +40,6 @@
 7. 等待社区review这个PR
 8. PR合入，特性开发完成！
 
-## 代码格式化
-
-代码格式化gradle插件[google-java-format-gradle-plugin](https://github.com/sherter/google-java-format-gradle-plugin).
-
-执行任务 `googleJavaFormat`格式化java文件。
-```
-./gradlew goJF
-```
-执行任务 `verifyGoogleJavaFormat`验证java文件是否格式化完成
-```          
-./gradlew verGJF
-```
-
 ## 持续集成（CI）
 
 持续集成框架

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v2.0.0-rc3
+v2.0.0-rc2