Skip to content
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
1 change: 1 addition & 0 deletions .github/workflows/run-tests-on-push-to-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
cargo clippy \
--package acropolis_common \
--package acropolis_codec \
--package acropolis_module_address_state \
--package acropolis_module_assets_state \
--package acropolis_module_block_unpacker \
--package acropolis_module_chain_store \
Expand Down
8 changes: 4 additions & 4 deletions modules/address_state/src/address_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl AddressState {
if let Message::Cardano((ref block_info, CardanoMessage::ProtocolParams(params))) =
message.as_ref()
{
Self::check_sync(&current_block, &block_info, "params");
Self::check_sync(&current_block, block_info, "params");
let mut state = state_mutex.lock().await;
state.volatile.start_new_epoch(block_info.number);
if let Some(shelley) = &params.params.shelley {
Expand Down Expand Up @@ -209,21 +209,21 @@ impl AddressState {
let state = state_mutex.lock().await;
let response = match query {
AddressStateQuery::GetAddressUTxOs { address } => {
match state.get_address_utxos(&address).await {
match state.get_address_utxos(address).await {
Ok(Some(utxos)) => AddressStateQueryResponse::AddressUTxOs(utxos),
Ok(None) => AddressStateQueryResponse::NotFound,
Err(e) => AddressStateQueryResponse::Error(e.to_string()),
}
}
AddressStateQuery::GetAddressTransactions { address } => {
match state.get_address_transactions(&address).await {
match state.get_address_transactions(address).await {
Ok(Some(txs)) => AddressStateQueryResponse::AddressTransactions(txs),
Ok(None) => AddressStateQueryResponse::NotFound,
Err(e) => AddressStateQueryResponse::Error(e.to_string()),
}
}
AddressStateQuery::GetAddressTotals { address } => {
match state.get_address_totals(&address).await {
match state.get_address_totals(address).await {
Ok(totals) => AddressStateQueryResponse::AddressTotals(totals),
Err(e) => AddressStateQueryResponse::Error(e.to_string()),
}
Expand Down
6 changes: 3 additions & 3 deletions modules/address_state/src/immutable_address_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@ impl ImmutableAddressStore {
batch.insert(
&self.utxos,
ADDRESS_UTXOS_EPOCH_COUNTER,
&epoch.to_le_bytes(),
epoch.to_le_bytes(),
);
}
if persist_txs {
batch.insert(&self.txs, ADDRESS_TXS_EPOCH_COUNTER, &epoch.to_le_bytes());
batch.insert(&self.txs, ADDRESS_TXS_EPOCH_COUNTER, epoch.to_le_bytes());
}
if persist_totals {
batch.insert(
&self.totals,
ADDRESS_TOTALS_EPOCH_COUNTER,
&epoch.to_le_bytes(),
epoch.to_le_bytes(),
);
}

Expand Down
10 changes: 2 additions & 8 deletions modules/address_state/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,7 @@ impl State {

let store = self.immutable.clone();

let mut combined: Vec<TxIdentifier> = match store.get_txs(address).await? {
Some(db) => db,
None => Vec::new(),
};
let mut combined: Vec<TxIdentifier> = store.get_txs(address).await?.unwrap_or_default();

for map in self.volatile.window.iter() {
if let Some(entry) = map.get(address) {
Expand All @@ -148,10 +145,7 @@ impl State {

let store = self.immutable.clone();

let mut totals = match store.get_totals(address).await? {
Some(db) => db,
None => AddressTotals::default(),
};
let mut totals = store.get_totals(address).await?.unwrap_or_default();

for map in self.volatile.window.iter() {
if let Some(entry) = map.get(address) {
Expand Down