Skip to content

fix BcosSdk crash bug #415

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

Merged
merged 1 commit into from
Nov 24, 2021
Merged

fix BcosSdk crash bug #415

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
22 changes: 10 additions & 12 deletions sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,22 @@

public class BcosSDK {
private static Logger logger = LoggerFactory.getLogger(BcosSDK.class);
public static final String ECDSA_TYPE_STR = "ecdsa";
public static final String SM_TYPE_STR = "sm";

private final ConfigOption config;
private org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk;
// private org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk;
private org.fisco.bcos.sdk.jni.rpc.Rpc jniRpcImpl;

public ConfigOption getConfig() {
return config;
}

public org.fisco.bcos.sdk.jni.BcosSDK getJniBcosSdk() {
return jniBcosSdk;
}

public void setJniBcosSdk(org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk) {
this.jniBcosSdk = jniBcosSdk;
}
// public org.fisco.bcos.sdk.jni.BcosSDK getJniBcosSdk() {
// return jniBcosSdk;
// }
//
// public void setJniBcosSdk(org.fisco.bcos.sdk.jni.BcosSDK jniBcosSdk) {
// this.jniBcosSdk = jniBcosSdk;
// }

/**
* Build BcosSDK instance
Expand All @@ -67,9 +65,9 @@ public static BcosSDK build(String tomlConfigFilePath) throws BcosSDKException {
* @throws BcosSDKException
*/
public BcosSDK(ConfigOption configOption) throws BcosSDKException {
this.config = configOption;
try {
this.jniBcosSdk = org.fisco.bcos.sdk.jni.BcosSDK.build(configOption.getJniConfig());
this.config = configOption;
// this.jniBcosSdk = org.fisco.bcos.sdk.jni.BcosSDK.build(configOption.getJniConfig());
this.jniRpcImpl = org.fisco.bcos.sdk.jni.rpc.Rpc.build(config.getJniConfig());
} catch (Exception e) {
logger.warn("error: {}", e);
Expand Down
20 changes: 20 additions & 0 deletions src/integration-test/java/org/fisco/bcos/sdk/BcosSDKTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.fisco.bcos.sdk;

import java.math.BigInteger;
import java.util.List;
import java.util.Random;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -345,4 +346,23 @@ public void testHelloWorldInLiquid() throws ConfigException, JniException, Contr
s2 = helloWorld.get();
System.out.println("helloworld get :" + s2);
}

@Test
public void testGetGroupList() throws ConfigException, JniException {
ConfigOption configOption = Config.load(configFile);

System.out.println("configOption: " + configOption);

Client clientWithoutGroupId = Client.build(configOption);
System.out.println("build clientWithoutGroupId");
List<String> groupList = clientWithoutGroupId.getGroupList().getResult().getGroupList();
System.out.println("getGroupList: " + groupList);

BcosSDK bcosSDK = new BcosSDK(configOption);
for(String groupId: groupList) {
Client client = bcosSDK.getClient(groupId);
System.out.println("build client, groupId: " + groupId);
System.out.println("getBlockNumber, blk: " + client.getBlockNumber().getBlockNumber());
}
}
}