Lints

matter-labs · Jul 29, 2024 · 6f03ee8 · 6f03ee8
1 parent a7d4ac3
commit 6f03ee8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/core/lib/object_store/src/objects.rs b/core/lib/object_store/src/objects.rs
@@ -136,7 +136,7 @@ impl dyn ObjectStore + '_ {
     pub async fn get<V: StoredObject>(&self, key: V::Key<'_>) -> Result<V, ObjectStoreError> {
         let key = V::encode_key(key);
         // Record the key for tracing.
-        tracing::Span::current().record("key", &key.as_str());
+        tracing::Span::current().record("key", key.as_str());
         let bytes = self.get_raw(V::BUCKET, &key).await?;
         V::deserialize(bytes).map_err(ObjectStoreError::Serialization)
     }
@@ -178,7 +178,7 @@ impl dyn ObjectStore + '_ {
     ) -> Result<String, ObjectStoreError> {
         let key = V::encode_key(key);
         // Record the key for tracing.
-        tracing::Span::current().record("key", &key.as_str());
+        tracing::Span::current().record("key", key.as_str());
         let bytes = value.serialize().map_err(ObjectStoreError::Serialization)?;
         self.put_raw(V::BUCKET, &key, bytes).await?;
         Ok(key)
@@ -197,7 +197,7 @@ impl dyn ObjectStore + '_ {
     pub async fn remove<V: StoredObject>(&self, key: V::Key<'_>) -> Result<(), ObjectStoreError> {
         let key = V::encode_key(key);
         // Record the key for tracing.
-        tracing::Span::current().record("key", &key.as_str());
+        tracing::Span::current().record("key", key.as_str());
         self.remove_raw(V::BUCKET, &key).await
     }
 

diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
@@ -43,14 +43,12 @@ type InitSetupOptions = {
     skipSubmodulesCheckout: boolean;
     runObservability: boolean;
     deploymentMode: DeploymentMode;
-    shouldCheckPostgres: boolean; // Whether to perform `cargo sqlx prepare --check`
 };
 const initSetup = async ({
     skipSubmodulesCheckout,
     skipEnvSetup,
     runObservability,
-    deploymentMode,
-    shouldCheckPostgres
+    deploymentMode
 }: InitSetupOptions): Promise<void> => {
     await announced(
         `Initializing in ${deploymentMode == contract.DeploymentMode.Validium ? 'Validium mode' : 'Roll-up mode'}`
@@ -147,6 +145,7 @@ type InitDevCmdActionOptions = InitSetupOptions & {
     baseTokenName?: string;
     validiumMode?: boolean;
     localLegacyBridgeTesting?: boolean;
+    shouldCheckPostgres: boolean; // Whether to perform `cargo sqlx prepare --check`
 };
 export const initDevCmdAction = async ({
     skipEnvSetup,
@@ -168,8 +167,7 @@ export const initDevCmdAction = async ({
         skipEnvSetup,
         skipSubmodulesCheckout,
         runObservability,
-        deploymentMode,
-        shouldCheckPostgres
+        deploymentMode
     });
     if (!skipVerifier) {
         await deployVerifier();
@@ -178,7 +176,7 @@ export const initDevCmdAction = async ({
         await deployTestTokens(testTokenOptions);
     }
     await initBridgehubStateTransition();
-    await initDatabase();
+    await initDatabase(shouldCheckPostgres);
     await initHyperchain({
         includePaymaster: true,
         baseTokenName,
@@ -232,8 +230,7 @@ export const initHyperCmdAction = async ({
             skipEnvSetup: false,
             skipSubmodulesCheckout: false,
             runObservability,
-            deploymentMode,
-            shouldCheckPostgres: true
+            deploymentMode
         });
     }
     await initDatabase();