Skip to content

设置 txVsersion 默认值为 1,兼容老版本的默认配置.排除掉低版本guava依赖,使用grpc的guava依赖 #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
springrain wants to merge 1 commit into
base: master
Choose a base branch
from
Open

设置 txVsersion 默认值为 1,兼容老版本的默认配置.排除掉低版本guava依赖,使用grpc的guava依赖 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,13 @@
<groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
<version>1.2.0</version>
<!-- 排除掉低版本guava依赖,使用grpc的guava依赖 -->
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>


Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/baidu/xuper/config/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class Config {
private ComplianceCheck complianceCheck;
private String minNewChainAmount;
private String crypto;
private Integer txVersion;
private Integer txVersion=1;

private Config() {
}
Expand Down Expand Up @@ -50,7 +50,12 @@ public static Config getInstance() {

private static Config getConfigFromYaml() throws Exception {
Yaml yaml = new Yaml(new Constructor(Config.class));
return yaml.load(new FileInputStream(new File(confFilePath)));
Config config= yaml.load(new FileInputStream(new File(confFilePath)));
if (config.getTxVersion()==null){
config.setTxVersion(1);
}
return config;
//return yaml.load(new FileInputStream(new File(confFilePath)));
}

private static Config getDefaultConfig() {
Expand Down