diff --git a/crates/dips/src/lib.rs b/crates/dips/src/lib.rs index b5131ec45..2c59b42fc 100644 --- a/crates/dips/src/lib.rs +++ b/crates/dips/src/lib.rs @@ -275,10 +275,10 @@ pub async fn validate_and_create_agreement( allowed_payers: impl AsRef<[Address]>, voucher: Vec, ) -> Result { - let voucher = SignedIndexingAgreementVoucher::abi_decode(&mut voucher.as_ref(), true) + let voucher = SignedIndexingAgreementVoucher::abi_decode(voucher.as_ref(), true) .map_err(|e| DipsError::AbiDecoding(e.to_string()))?; let metadata = - SubgraphIndexingVoucherMetadata::abi_decode(&mut voucher.voucher.metadata.as_ref(), true) + SubgraphIndexingVoucherMetadata::abi_decode(voucher.voucher.metadata.as_ref(), true) .map_err(|e| DipsError::AbiDecoding(e.to_string()))?; voucher.validate(domain, expected_payee, allowed_payers)?; @@ -293,7 +293,7 @@ pub async fn validate_and_cancel_agreement( domain: &Eip712Domain, cancellation_request: Vec, ) -> Result { - let request = SignedCancellationRequest::abi_decode(&mut cancellation_request.as_ref(), true) + let request = SignedCancellationRequest::abi_decode(cancellation_request.as_ref(), true) .map_err(|e| DipsError::AbiDecoding(e.to_string()))?; let result = store @@ -554,7 +554,7 @@ mod test { maxEpochsPerCollection: 10, deadline: (SystemTime::now() + Duration::from_secs(3600)) .duration_since(UNIX_EPOCH)? - .as_secs() as u64, + .as_secs(), metadata: metadata.abi_encode().into(), }; diff --git a/crates/service/src/database/dips.rs b/crates/service/src/database/dips.rs index da8d1378c..f1ca073f7 100644 --- a/crates/service/src/database/dips.rs +++ b/crates/service/src/database/dips.rs @@ -25,7 +25,7 @@ fn uint256_to_bigdecimal(uint256: &uint256) -> BigDecimal { } fn uint32_to_i64(uint32: u32) -> i64 { - uint32.try_into().unwrap() + uint32.into() } #[async_trait] @@ -45,7 +45,7 @@ impl AgreementStore for PsqlAgreementStore { }; let signed = - SignedIndexingAgreementVoucher::abi_decode(&mut item.signed_payload.as_ref(), true)?; + SignedIndexingAgreementVoucher::abi_decode(item.signed_payload.as_ref(), true)?; let cancelled = item.cancelled_at.is_some(); Ok(Some((signed, cancelled))) } @@ -133,7 +133,7 @@ pub(crate) mod test { #[sqlx::test(migrations = "../../migrations")] async fn test_store_agreement(pool: PgPool) { - let store = Arc::new(PsqlAgreementStore { pool: pool }); + let store = Arc::new(PsqlAgreementStore { pool }); let id = Uuid::now_v7(); // Create metadata first @@ -184,7 +184,7 @@ pub(crate) mod test { #[sqlx::test(migrations = "../../migrations")] async fn test_get_agreement_by_id(pool: PgPool) { - let store = Arc::new(PsqlAgreementStore { pool: pool }); + let store = Arc::new(PsqlAgreementStore { pool }); let id = Uuid::parse_str("a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7d9").unwrap(); // Create metadata first @@ -227,7 +227,7 @@ pub(crate) mod test { let cancelled = retrieved.1; let retrieved_metadata = ::abi_decode( - &mut retrieved_voucher.metadata.as_ref(), + retrieved_voucher.metadata.as_ref(), true, ) .unwrap(); @@ -262,12 +262,12 @@ pub(crate) mod test { retrieved_voucher.minEpochsPerCollection, agreement.voucher.minEpochsPerCollection ); - assert_eq!(cancelled, false); + assert!(!cancelled); } #[sqlx::test(migrations = "../../migrations")] async fn test_cancel_agreement(pool: PgPool) { - let store = Arc::new(PsqlAgreementStore { pool: pool }); + let store = Arc::new(PsqlAgreementStore { pool }); let id = Uuid::parse_str("a1a2a3a4b1b2c1c2d1d2d3d4d5d6d7e9").unwrap(); // Create metadata first