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.

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

Jump to bottom

ES-1992: Replace deprecated methods with recommended usage #98

Merged
merged 1 commit into from
Mar 1, 2024
Merged

ES-1992: Replace deprecated methods with recommended usage #98

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
8 changes: 4 additions & 4 deletions workflows/src/main/kotlin/com/r3/developers/apples/workflows/RedeemApplesFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ class RedeemApplesFlow : ClientStartableFlow {
val buyer = memberLookup.lookup(buyerName)?.ledgerKeys?.first()
?: throw IllegalArgumentException("The buyer does not exist within the network")

val appleStampStateAndRef = utxoLedgerService.findUnconsumedStatesByType(AppleStamp::class.java)
.firstOrNull { stateAndRef -> stateAndRef.state.contractState.id == stampId }
val appleStampStateAndRef = utxoLedgerService.findUnconsumedStatesByExactType(AppleStamp::class.java, 100, Instant.now())
.results.firstOrNull { stateAndRef -> stateAndRef.state.contractState.id == stampId }
?: throw IllegalArgumentException("No apple stamp matching the stamp id $stampId")

val basketOfApplesStampStateAndRef = utxoLedgerService.findUnconsumedStatesByType(BasketOfApples::class.java)
.firstOrNull { basketStateAndRef -> basketStateAndRef.state.contractState.owner ==
val basketOfApplesStampStateAndRef = utxoLedgerService.findUnconsumedStatesByExactType(BasketOfApples::class.java, 100, Instant.now())
.results.firstOrNull { basketStateAndRef -> basketStateAndRef.state.contractState.owner ==
appleStampStateAndRef.state.contractState.issuer }
?: throw IllegalArgumentException("There are no eligible baskets of apples")

Expand Down
3 changes: 2 additions & 1 deletion ...ws/src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/workflows/GetChatFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import net.corda.v5.base.exceptions.CordaRuntimeException
import net.corda.v5.ledger.utxo.StateAndRef
import net.corda.v5.ledger.utxo.UtxoLedgerService
import org.slf4j.LoggerFactory
import java.time.Instant
import java.util.*

// A class to hold the deserialized arguments required to start the flow.
Expand Down Expand Up @@ -44,7 +45,7 @@ class GetChatFlow: ClientStartableFlow {
// Note, this code brings all unconsumed states back, then filters them.
// This is an inefficient way to perform this operation when there are a large number of chats.
// Note, you will get this error if you input an id which has no corresponding ChatState (common error).
val states = ledgerService.findUnconsumedStatesByType(ChatState::class.java)
val states = ledgerService.findUnconsumedStatesByExactType(ChatState::class.java, 100, Instant.now()).results
val state = states.singleOrNull {it.state.contractState.id == flowArgs.id}
?: throw CordaRuntimeException("Did not find an unique unconsumed ChatState with id ${flowArgs.id}")

Expand Down
3 changes: 2 additions & 1 deletion .../src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/workflows/ListChatsFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import net.corda.v5.application.marshalling.JsonMarshallingService
import net.corda.v5.base.annotations.Suspendable
import net.corda.v5.ledger.utxo.UtxoLedgerService
import org.slf4j.LoggerFactory
import java.time.Instant
import java.util.*


Expand Down Expand Up @@ -38,7 +39,7 @@ class ListChatsFlow : ClientStartableFlow {
log.info("ListChatsFlow.call() called")

// Queries the VNode's vault for unconsumed states and converts the result to a serializable DTO.
val states = ledgerService.findUnconsumedStatesByType(ChatState::class.java)
val states = ledgerService.findUnconsumedStatesByExactType(ChatState::class.java, 100, Instant.now()).results
val results = states.map {
ChatStateResults(
it.state.contractState.id,
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/workflows/UpdateChatFlow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class UpdateChatFlow: ClientStartableFlow {
// Note, this code brings all unconsumed states back, then filters them.
// This is an inefficient way to perform this operation when there are a large number of chats.
// Note, you will get this error if you input an id which has no corresponding ChatState (common error).
val stateAndRef = ledgerService.findUnconsumedStatesByType(ChatState::class.java).singleOrNull {
val stateAndRef = ledgerService.findUnconsumedStatesByExactType(ChatState::class.java, 100, Instant.now()).results.singleOrNull {
it.state.contractState.id == flowArgs.id
} ?: throw CordaRuntimeException("Multiple or zero Chat states with id ${flowArgs.id} found.")

Expand Down
Loading