Skip to content

Commit 0fbf31e

Browse files
authored
Iroha/2.0.0 rc.1 (#164)
* update iroha-java to RC.1 Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * update iroha-java to RC.1 Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * update to iroha 2.0.0-rc.1 Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * update genesis.json Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * update genesis.json Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * update genesis generator, preconditionList.csv, genesis.json Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> * genesis.json Signed-off-by: timofeevmd <timofeevmd@gmail.com> Signed-off-by: timofeevmd <timofeevmd@gmail.com> --------- Signed-off-by: timofeevmd <timofeevmd@gmail.com>
1 parent efb69b7 commit 0fbf31e

File tree

5 files changed

+6301
-6279
lines changed

5 files changed

+6301
-6279
lines changed

performance-generator/.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
1716
import java.net.*;
1817
import java.io.*;
1918
import java.nio.channels.*;
@@ -26,7 +25,7 @@ public class MavenWrapperDownloader {
2625
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
2726
*/
2827
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
29-
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
28+
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
3029

3130
/**
3231
* Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
@@ -55,7 +54,7 @@ public static void main(String args[]) {
5554
// wrapperUrl parameter.
5655
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
5756
String url = DEFAULT_DOWNLOAD_URL;
58-
if (mavenWrapperPropertyFile.exists()) {
57+
if(mavenWrapperPropertyFile.exists()) {
5958
FileInputStream mavenWrapperPropertyFileInputStream = null;
6059
try {
6160
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
@@ -66,7 +65,7 @@ public static void main(String args[]) {
6665
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
6766
} finally {
6867
try {
69-
if (mavenWrapperPropertyFileInputStream != null) {
68+
if(mavenWrapperPropertyFileInputStream != null) {
7069
mavenWrapperPropertyFileInputStream.close();
7170
}
7271
} catch (IOException e) {
@@ -77,8 +76,8 @@ public static void main(String args[]) {
7776
System.out.println("- Downloading from: " + url);
7877

7978
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
80-
if (!outputFile.getParentFile().exists()) {
81-
if (!outputFile.getParentFile().mkdirs()) {
79+
if(!outputFile.getParentFile().exists()) {
80+
if(!outputFile.getParentFile().mkdirs()) {
8281
System.out.println(
8382
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
8483
}

performance-generator/src/test/java/requests/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class Constants {
3535

3636
public static final String SMART_CONTRACT_ACTIVATION_CODE = "019153fc-8d19-7faa-854a-57657ba0ed20";
3737

38-
public static FeederBuilder<String> CSV_FEEDER = csv("iroha2_config/main/1c7160aa/preconditionList.csv").circular();
38+
public static FeederBuilder<String> CSV_FEEDER = csv("iroha2_config/2_0_0-rc_1/f348b9a8/preconditionList.csv").circular();
3939

4040
public static FeederBuilder<String> PEERS_FEEDER = csv("peers.csv").circular();
4141

0 commit comments

Comments
 (0)