Skip to content
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.

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

<perf&fix>(jni): perf jni code format, fix ci fetch vcpkg error. #206

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 0 additions & 8 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ jobs:
- name: install macOS dependencies
if: runner.os == 'macOS'
run: brew install ccache lcov
- name: fetch vcpkg
run: cd /usr/local/share/vcpkg/ && git status && git reset --hard && git stash && git fetch && git pull && cd -
- name: configure
if: runner.os == 'macOS'
run: |
Expand Down Expand Up @@ -91,8 +89,6 @@ jobs:
vcpkg-gcc-v1-notest-${{ runner.temp }}-
- name: install Ubuntu dependencies
run: sudo apt install -y git curl openssl build-essential cmake ccache lcov
# - name: fetch vcpkg
# run: cd /usr/local/share/vcpkg/ && git fetch --all && git checkout master && git pull && cd -
- name: configure
run: |
export CC='gcc-10'; export CXX='g++-10'
Expand Down Expand Up @@ -156,8 +152,6 @@ jobs:
ln -s /usr/local/cmake/bin/cmake /usr/bin/cmake
cmake --version
git --version
# - name: fetch vcpkg
# run: cd /usr/local/share/vcpkg/ && git fetch --all && git checkout master && git pull && cd -
- name: configure
run: |
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
Expand Down Expand Up @@ -210,8 +204,6 @@ jobs:
vcpkg-msvc-v1-notest-${{ runner.temp }}-
- name: Add MSbuild to PATH
uses: microsoft/[email protected]
- name: fetch vcpkg
run: cd C:\vcpkg && git fetch && git reset --hard && git pull && cd -
- name: configure
if: runner.os == 'Windows'
run: |
Expand Down
Original file line number Diff line number Diff line change
@@ -1,121 +1,121 @@
package org.fisco.bcos.sdk.jni.utilities.tx;

public class TransactionDataV2 {
private int version;
private long blockLimit;
private String chainId;
private String groupId;
private String nonce;
private String to;
private String abi;
private TransactionBytes input;
private String value;
private String gasPrice;
private long gasLimit;
private String maxFeePerGas;
private String maxPriorityFeePerGas;

public int getVersion() {
return version;
}

public void setVersion(int version) {
this.version = version;
}

public long getBlockLimit() {
return blockLimit;
}

public void setBlockLimit(long blockLimit) {
this.blockLimit = blockLimit;
}

public String getChainId() {
return chainId;
}

public void setChainId(String chainId) {
this.chainId = chainId;
}

public String getGroupId() {
return groupId;
}

public void setGroupId(String groupId) {
this.groupId = groupId;
}

public String getNonce() {
return nonce;
}

public void setNonce(String nonce) {
this.nonce = nonce;
}

public String getTo() {
return to;
}

public void setTo(String to) {
this.to = to;
}

public String getAbi() {
return abi;
}

public void setAbi(String abi) {
this.abi = abi;
}

public TransactionBytes getInput() {
return input;
}

public void setInput(TransactionBytes input) {
this.input = input;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}

public String getGasPrice() {
return gasPrice;
}

public void setGasPrice(String gasPrice) {
this.gasPrice = gasPrice;
}

public long getGasLimit() {
return gasLimit;
}

public void setGasLimit(long gasLimit) {
this.gasLimit = gasLimit;
}

public String getMaxFeePerGas() {
return maxFeePerGas;
}

public void setMaxFeePerGas(String maxFeePerGas) {
this.maxFeePerGas = maxFeePerGas;
}

public String getMaxPriorityFeePerGas() {
return maxPriorityFeePerGas;
}
private int version;
private long blockLimit;
private String chainId;
private String groupId;
private String nonce;
private String to;
private String abi;
private TransactionBytes input;
private String value;
private String gasPrice;
private long gasLimit;
private String maxFeePerGas;
private String maxPriorityFeePerGas;

public int getVersion() {
return version;
}

public void setVersion(int version) {
this.version = version;
}

public long getBlockLimit() {
return blockLimit;
}

public void setBlockLimit(long blockLimit) {
this.blockLimit = blockLimit;
}

public String getChainId() {
return chainId;
}

public void setChainId(String chainId) {
this.chainId = chainId;
}

public String getGroupId() {
return groupId;
}

public void setGroupId(String groupId) {
this.groupId = groupId;
}

public String getNonce() {
return nonce;
}

public void setNonce(String nonce) {
this.nonce = nonce;
}

public String getTo() {
return to;
}

public void setTo(String to) {
this.to = to;
}

public String getAbi() {
return abi;
}

public void setAbi(String abi) {
this.abi = abi;
}

public TransactionBytes getInput() {
return input;
}

public void setInput(TransactionBytes input) {
this.input = input;
}

public String getValue() {
return value;
}

public void setValue(String value) {
this.value = value;
}

public String getGasPrice() {
return gasPrice;
}

public void setGasPrice(String gasPrice) {
this.gasPrice = gasPrice;
}

public long getGasLimit() {
return gasLimit;
}

public void setGasLimit(long gasLimit) {
this.gasLimit = gasLimit;
}

public String getMaxFeePerGas() {
return maxFeePerGas;
}

public void setMaxFeePerGas(String maxFeePerGas) {
this.maxFeePerGas = maxFeePerGas;
}

public String getMaxPriorityFeePerGas() {
return maxPriorityFeePerGas;
}

public void setMaxPriorityFeePerGas(String maxPriorityFeePerGas) {
this.maxPriorityFeePerGas = maxPriorityFeePerGas;
}
public void setMaxPriorityFeePerGas(String maxPriorityFeePerGas) {
this.maxPriorityFeePerGas = maxPriorityFeePerGas;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public static native String createEncodedTransactionV2(
* @param transaction Transaction struct
* @return Hexed Transaction
*/
public static native String encodeTransactionStructV2(TransactionV2 transaction) throws JniException;
public static native String encodeTransactionStructV2(TransactionV2 transaction)
throws JniException;

/**
* @param transaction Transaction struct
Expand Down
Loading
Loading