diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_txo_assets_by_stake_addr.cql b/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_txo_assets_by_stake_addr.cql index c46df7011bb..6517902a790 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_txo_assets_by_stake_addr.cql +++ b/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_txo_assets_by_stake_addr.cql @@ -5,4 +5,4 @@ WHERE stake_address = :stake_address AND txn = :txn AND txo = :txo AND policy_id = :policy_id - AND policy_name = :policy_name + AND asset_name = :asset_name diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_unstaked_txo_assets_by_txn_hash.cql b/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_unstaked_txo_assets_by_txn_hash.cql index 8b975bf963d..182765ea8ed 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_unstaked_txo_assets_by_txn_hash.cql +++ b/catalyst-gateway/bin/src/db/index/queries/purge/cql/delete_unstaked_txo_assets_by_txn_hash.cql @@ -3,4 +3,4 @@ DELETE FROM unstaked_txo_assets_by_txn_hash WHERE txn_hash = :txn_hash AND txo = :txo AND policy_id = :policy_id - AND policy_name = :policy_name + AND asset_name = :asset_name diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_txo_assets_by_stake_addr.cql b/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_txo_assets_by_stake_addr.cql index 07de857bd5a..1556b364f17 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_txo_assets_by_stake_addr.cql +++ b/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_txo_assets_by_stake_addr.cql @@ -5,5 +5,5 @@ SELECT txn, txo, policy_id, - policy_name + asset_name FROM txo_assets_by_stake diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_unstaked_txo_assets_by_txn_hash.cql b/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_unstaked_txo_assets_by_txn_hash.cql index 45ae2ef93b1..8f56fd434ef 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_unstaked_txo_assets_by_txn_hash.cql +++ b/catalyst-gateway/bin/src/db/index/queries/purge/cql/get_unstaked_txo_assets_by_txn_hash.cql @@ -3,5 +3,5 @@ SELECT txn_hash, txo, policy_id, - policy_name + asset_name FROM unstaked_txo_assets_by_txn_hash diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/txo_assets.rs b/catalyst-gateway/bin/src/db/index/queries/purge/txo_assets.rs index 50df27451aa..99d4db7affe 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/txo_assets.rs +++ b/catalyst-gateway/bin/src/db/index/queries/purge/txo_assets.rs @@ -22,7 +22,7 @@ pub(crate) mod result { //! Return values for TXO Assets by Stake Address purge queries. /// Primary Key Row - pub(crate) type PrimaryKey = (Vec, num_bigint::BigInt, i16, i16, Vec, String); + pub(crate) type PrimaryKey = (Vec, num_bigint::BigInt, i16, i16, Vec, Vec); } /// Select primary keys for TXO Assets by Stake Address. @@ -42,8 +42,7 @@ pub(crate) struct Params { /// Asset Policy Hash - Binary 28 bytes. policy_id: Vec, /// Name of the Policy (UTF8) - // TODO: https://github.com/input-output-hk/catalyst-voices/issues/1121 - policy_name: String, + asset_name: Vec, } impl Debug for Params { @@ -54,7 +53,7 @@ impl Debug for Params { .field("txn", &self.txn) .field("txo", &self.txo) .field("policy_id", &self.policy_id) - .field("policy_name", &self.policy_name) + .field("asset_name", &self.asset_name) .finish() } } @@ -67,7 +66,7 @@ impl From for Params { txn: value.2, txo: value.3, policy_id: value.4, - policy_name: value.5, + asset_name: value.5, } } } diff --git a/catalyst-gateway/bin/src/db/index/queries/purge/unstaked_txo_assets.rs b/catalyst-gateway/bin/src/db/index/queries/purge/unstaked_txo_assets.rs index 89f277056ea..46cc3a162cb 100644 --- a/catalyst-gateway/bin/src/db/index/queries/purge/unstaked_txo_assets.rs +++ b/catalyst-gateway/bin/src/db/index/queries/purge/unstaked_txo_assets.rs @@ -22,7 +22,7 @@ pub(crate) mod result { //! Return values for TXO Assets by TXN Hash purge queries. /// Primary Key Row - pub(crate) type PrimaryKey = (Vec, num_bigint::BigInt, i16, i16, Vec, String); + pub(crate) type PrimaryKey = (Vec, num_bigint::BigInt, i16, i16, Vec, Vec); } /// Select primary keys for TXO Assets by TXN Hash. @@ -42,8 +42,7 @@ pub(crate) struct Params { /// Asset Policy Hash - Binary 28 bytes. policy_id: Vec, /// Name of the Policy (UTF8) - // TODO: https://github.com/input-output-hk/catalyst-voices/issues/1121 - policy_name: String, + asset_name: Vec, } impl Debug for Params { @@ -54,7 +53,7 @@ impl Debug for Params { .field("txn", &self.txn) .field("txo", &self.txo) .field("policy_id", &self.policy_id) - .field("policy_name", &self.policy_name) + .field("asset_name", &self.asset_name) .finish() } } @@ -67,7 +66,7 @@ impl From for Params { txn: value.2, txo: value.3, policy_id: value.4, - policy_name: value.5, + asset_name: value.5, } } }