Skip to content

resolve function #3694

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
Mar 17, 2021
Merged

resolve function #3694

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
14 changes: 0 additions & 14 deletions framework/src/test/java/stest/tron/wallet/common/client/utils/PublicMethed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7211,18 +7211,4 @@ public static Optional<Transaction> getTransactionFromPending(String txId,
return Optional.ofNullable(transaction);
}

/**
* 61 constructor.
*/

public static Optional<Transaction> getTransactionFromPending(String txId,
WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubSolidity) {
ByteString bsTxid = ByteString.copyFrom(ByteArray.fromHexString(txId));
BytesMessage request = BytesMessage.newBuilder().setValue(bsTxid).build();
Transaction transaction;
transaction = blockingStubSolidity.getTransactionFromPending(request);
return Optional.ofNullable(transaction);
}


}
48 changes: 0 additions & 48 deletions ...rk/src/test/java/stest/tron/wallet/dailybuild/transaction/TransactionPendingQuery001.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,54 +124,6 @@ public void test03GetTransactionFromPending() {
.hash(true, transaction.getRawData().toByteArray())),txid);
}

@Test(enabled = false, description = "Test get pending size on solidity")
public void test04GetPendingSizeOnSolidity() {

long pendingSizeInFullNode = 0;
int retryTimes = 100;
while (pendingSizeInFullNode == 0 && retryTimes-- > 0) {
PublicMethed.sendcoin(receiverAddress,1L,fromAddress,testKey002,blockingStubFull);
if (retryTimes % 10 == 0) {
pendingSizeInFullNode = blockingStubSolidity
.getPendingSize(EmptyMessage.newBuilder().build()).getNum();
}
}
Assert.assertNotEquals(pendingSizeInFullNode,0);
}




@Test(enabled = false, description = "Test get pending transaction list on solidity")
public void test05GetPendingTransactionListOnSolidity() {
int retryTimes = 100;
TransactionList transactionList = blockingStubSolidity
.getTransactionListFromPending(EmptyMessage.newBuilder().build());
while (transactionList.getTransactionCount() == 0 && retryTimes-- > 0) {
PublicMethed.sendcoin(receiverAddress,1L,fromAddress,testKey002,blockingStubFull);
if (retryTimes % 5 == 0) {
transactionList = blockingStubSolidity
.getTransactionListFromPending(EmptyMessage.newBuilder().build());
}
}
Assert.assertNotEquals(transactionList.getTransactionCount(),0);

txid = ByteArray.toHexString(Sha256Hash
.hash(true, transactionList
.getTransaction(0).getRawData().toByteArray()));

logger.info("txid:" + txid);

}


@Test(enabled = false, description = "Test transaction from pending on solidity")
public void test06GetTransactionFromPendingOnSolidity() {
Transaction transaction = PublicMethed
.getTransactionFromPending(txid,blockingStubSolidity).get();
Assert.assertEquals(ByteArray.toHexString(Sha256Hash
.hash(true, transaction.getRawData().toByteArray())),txid);
}

/**
* constructor.
Expand Down