mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-01-19 05:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove test scaffolding logic from ApiTestConfig

Browse Source
This commit is contained in:
ghubstan 2020-07-13 19:52:21 -03:00
parent 84976fef35
commit 2678b31a18
No known key found for this signature in database
GPG Key ID: E35592D6800A861E
1 changed files with 0 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
View File

@ -17,8 +17,6 @@
package bisq.apitest.config;
import bisq.common.storage.FileUtil;
import joptsimple.AbstractOptionSpec;
import joptsimple.ArgumentAcceptingOptionSpec;
import joptsimple.HelpFormatter;
@ -27,17 +25,12 @@ import joptsimple.OptionParser;
import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.PosixFilePermissions;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.UncheckedIOException;
import java.util.ArrayList;
@ -294,11 +287,6 @@ public class ApiTestConfig {
// Assign values to special-case static fields.
BASH_PATH_VALUE = bashPath;
// Write and save bitcoin.conf to disk, with the correct path to
// the blocknotify script.
installBitcoinConf();
installBitcoinBlocknotify();
} catch (OptionException ex) {
throw new IllegalStateException(format("Problem parsing option '%s': %s",
ex.options().get(0),
@ -317,40 +305,6 @@ public class ApiTestConfig {
}
}
private void installBitcoinConf() {
// We write out and install a bitcoin.conf file for regtest/dao mode because
// the path to the blocknotify script is not known until runtime.
String bitcoinConf = "\n"
+ "regtest=1\n"
+ "[regtest]\n"
+ "peerbloomfilters=1\n"
+ "rpcport=18443\n"
+ "server=1\n"
+ "txindex=1\n"
+ "debug=net\n"
+ "deprecatedrpc=generate\n"
+ "rpcuser=apitest\n"
+ "rpcpassword=apitest\n"
+ "blocknotify=" + bashPath + " " + bitcoinDatadir + "/blocknotify %\n";
String chmod644Perms = "rw-r--r--";
saveToFile(bitcoinConf, bitcoinDatadir, "bitcoin.conf", chmod644Perms);
log.info("Installed {} with perms {}.", bitcoinDatadir + "/bitcoin.conf", chmod644Perms);
}
private void installBitcoinBlocknotify() {
// gradle is not working for this
try {
Path srcPath = Paths.get("apitest", "src", "main", "resources", "blocknotify");
Path destPath = Paths.get(bitcoinDatadir, "blocknotify");
Files.copy(srcPath, destPath, StandardCopyOption.REPLACE_EXISTING);
String chmod700Perms = "rwx------";
Files.setPosixFilePermissions(destPath, PosixFilePermissions.fromString(chmod700Perms));
log.info("Installed {} with perms {}.", destPath.toString(), chmod700Perms);
} catch (IOException e) {
e.printStackTrace();
}
}
private Optional<OptionSet> parseOptionsFrom(File configFile, OptionSpec<?>[] disallowedOpts) {
if (!configFile.exists() && !configFile.equals(absoluteConfigFile(userDir, DEFAULT_CONFIG_FILE_NAME)))
throw new IllegalStateException(format("The specified config file '%s' does not exist.", configFile));
@ -383,32 +337,6 @@ public class ApiTestConfig {
}
}
private void saveToFile(String content,
String parentDir,
@SuppressWarnings("SameParameterValue") String relativeConfigFilePath,
String posixFilePermissions) {
File tempFile = null;
File file;
try {
file = absoluteConfigFile(parentDir, relativeConfigFilePath);
tempFile = File.createTempFile("temp", relativeConfigFilePath, file.getParentFile());
tempFile.deleteOnExit();
try (PrintWriter out = new PrintWriter(tempFile)) {
out.println(content);
}
FileUtil.renameFile(tempFile, file);
Files.setPosixFilePermissions(Paths.get(file.toURI()), PosixFilePermissions.fromString(posixFilePermissions));
} catch (IOException ex) {
throw new IllegalStateException(format("Error saving %s/%s to disk", parentDir, relativeConfigFilePath), ex);
} finally {
if (tempFile != null && tempFile.exists()) {
log.warn("Temp file still exists after failed save; deleting {} now.", tempFile.getAbsolutePath());
if (!tempFile.delete())
log.error("Cannot delete temp file.");
}
}
}
private static File absoluteConfigFile(String parentDir, String relativeConfigFilePath) {
return new File(parentDir, relativeConfigFilePath);
}