Skip to content

Commit

Permalink
Merge branch 'feature/1.0' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	consensus-module/poc/consensus-poc-base/src/main/java/io/nuls/consensus/poc/process/BlockMonitorProcess.java
  • Loading branch information
@niels1286
niels1286 committed Jul 17, 2018
2 parents ad4ce8a + e992b0c commit 75debe8
Show file tree
Hide file tree
Showing 142 changed files with 881 additions and 841 deletions.
11 changes: 7 additions & 4 deletions account-ledger-module/account-ledger/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,28 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>

<dependencies>
<dependency>
<groupId>io.nuls.core-module</groupId>
<artifactId>kernel</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
15 changes: 9 additions & 6 deletions account-ledger-module/base/account-ledger-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,39 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-base</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-storage</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.protocol-module</groupId>
<artifactId>protocol</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.consensus-module</groupId>
<artifactId>consensus</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
15 changes: 8 additions & 7 deletions account-ledger-module/base/account-ledger-rpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-rpc</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
Expand All @@ -39,19 +39,20 @@
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-base</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>


<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
6 changes: 3 additions & 3 deletions ...module/base/account-ledger-rpc/src/test/java/io/nuls/account/ledger/rpc/TransferTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static List<String> getAddressList() {
private static int successCount = 0;

public static void main(String[] args) {
for (int i = 0; i < 10; i++) {
for (int i = 0; i < 1000; i++) {
doit();
}
}
Expand All @@ -56,7 +56,7 @@ private static void doit() {
List<String> addressList = getAddressList();

for (String toAddress : addressList) {
String address = "Nse4hSu5rrgwmeHrewU9BR1kKzbAb9dH";
String address = "Nse4N9aeec5ViyeQnjanJzW7NjtqvV8n";
// String toAddress = "2Cg7BLHWBSxMhq3FpjR9BrkyxXp4m4j";
long amount = 2018000L;
String password = "";
Expand All @@ -67,7 +67,7 @@ private static void doit() {
String url = "http://127.0.0.1:8001/api/accountledger/transfer";


for (int i = 0; i < 100; i++) {
for (int i = 0; i < 1; i++) {
String res = post(url, param, "utf-8");
if (res.indexOf("true") != -1) {
successCount++;
Expand Down
10 changes: 6 additions & 4 deletions account-ledger-module/base/account-ledger-sdk/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-sdk</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.core-module</groupId>
<artifactId>kernel-sdk</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>

<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
14 changes: 8 additions & 6 deletions account-ledger-module/base/account-ledger-storage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,34 @@
<parent>
<artifactId>account-ledger-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-storage</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.db-module</groupId>
<artifactId>db</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>

<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
4 changes: 2 additions & 2 deletions account-ledger-module/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<parent>
<artifactId>nuls</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>io.nuls</groupId>
<artifactId>account-ledger-module</artifactId>
<packaging>pom</packaging>
<version>0.9.12</version>
<version>1.0.0</version>
<modules>
<module>account-ledger</module>
<module>base/account-ledger-storage</module>
Expand Down
9 changes: 6 additions & 3 deletions account-module/account/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,24 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.core-module</groupId>
<artifactId>kernel</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
55 changes: 13 additions & 42 deletions account-module/base/account-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,88 +5,59 @@
<parent>
<artifactId>account-module</artifactId>
<groupId>io.nuls</groupId>
<version>0.9.12</version>
<version>1.0.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

<groupId>io.nuls.account-module</groupId>
<artifactId>account-base</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>


<dependencies>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-module</groupId>
<artifactId>account-storage</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.protocol-module</groupId>
<artifactId>protocol</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.tools-module</groupId>
<artifactId>cache</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.message-bus-module</groupId>
<artifactId>message-bus</artifactId>
<version>0.9.12</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.nuls.db-module</groupId>
<artifactId>db-leveldb</artifactId>
<version>0.9.12</version>
</dependency>

<!-- test -->
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-base</artifactId>
<version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.nuls.account-ledger-module</groupId>
<artifactId>account-ledger-storage</artifactId>
<version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.nuls.message-bus-module</groupId>
<artifactId>message-bus-base</artifactId>
<version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger-utxo-base</artifactId>
<version>0.9.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.nuls.ledger-module</groupId>
<artifactId>ledger-utxo-storage</artifactId>
<version>0.9.12</version>
<scope>test</scope>
<version>1.0.0</version>
</dependency>
</dependencies>
<build>
<finalName>${artifactId}-${version}</finalName>
</build>
</project>
Loading

0 comments on commit 75debe8

Please sign in to comment.