fix: too long db names in tests (#1073)

* fix: too long db names in tests * chore: fix lint * chore: bump launcher version
blockscout · Sep 27, 2024 · 4cff309 · 4cff309
1 parent 3774de7
commit 4cff309
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/bens.yml b/.github/workflows/bens.yml
@@ -30,7 +30,7 @@ jobs:
  runs-on: ubuntu-latest
  services:
  postgres:
- image: postgres
+ image: postgres:16
  env:
  POSTGRES_PASSWORD: admin
  POSTGRES_USER: graph-node

diff --git a/.github/workflows/da-indexer.yml b/.github/workflows/da-indexer.yml
@@ -28,7 +28,7 @@ jobs:
  runs-on: ubuntu-latest
  services:
  postgres:
- image: postgres
+ image: postgres:16
  env:
  POSTGRES_PASSWORD: admin
  POSTGRES_USER: postgres

diff --git a/.github/workflows/eth-bytecode-db.yml b/.github/workflows/eth-bytecode-db.yml
@@ -28,7 +28,7 @@ jobs:
  runs-on: ubuntu-latest
  services:
  postgres:
- image: postgres
+ image: postgres:16
  env:
  POSTGRES_PASSWORD: admin
  POSTGRES_USER: postgres

diff --git a/.github/workflows/user-ops-indexer.yml b/.github/workflows/user-ops-indexer.yml
@@ -28,7 +28,7 @@ jobs:
  runs-on: ubuntu-latest
  services:
  postgres:
- image: postgres
+ image: postgres:16
  env:
  POSTGRES_PASSWORD: admin
  POSTGRES_USER: postgres

diff --git a/blockscout-ens/bens-logic/src/test_utils.rs b/blockscout-ens/bens-logic/src/test_utils.rs
@@ -83,7 +83,7 @@ pub async fn mocked_blockscout_client() -> BlockscoutClient {
  let mock_server = MockServer::start().await;
  for (tx_hash, tx) in TXNS.iter() {
  let mock =
- Mock::given(method("GET")).and(path(&format!("/api/v2/transactions/{tx_hash:#x}")));
+ Mock::given(method("GET")).and(path(format!("/api/v2/transactions/{tx_hash:#x}")));
  mock.respond_with(ResponseTemplate::new(200).set_body_json(tx))
  .mount(&mock_server)
  .await;

diff --git a/eth-bytecode-db/Cargo.lock b/eth-bytecode-db/Cargo.lock
diff --git a/libs/blockscout-service-launcher/Cargo.toml b/libs/blockscout-service-launcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "blockscout-service-launcher"
-version = "0.13.1"
+version = "0.13.2"
 description = "Allows to launch blazingly fast blockscout rust services"
 license = "MIT"
 repository = "https://github.com/blockscout/blockscout-rs"

diff --git a/libs/blockscout-service-launcher/src/test_database.rs b/libs/blockscout-service-launcher/src/test_database.rs
@@ -21,7 +21,8 @@ impl TestDbGuard {
  .await
  .expect("Connection to postgres (without database) failed");
  // We use a hash, as the name itself may be quite long and be trimmed.
- let db_name = format!("_{:x}", keccak_hash::keccak(db_name));
+ // Postgres DB name should be 63 symbols max.
+ let db_name = format!("_{:x}", keccak_hash::keccak(db_name))[..63].to_string();
  let mut guard = TestDbGuard {
  conn_with_db: Arc::new(DatabaseConnection::Disconnected),
  conn_without_db: Arc::new(conn_without_db),

diff --git a/service-template/.github/workflows/{{project-name}}.yml b/service-template/.github/workflows/{{project-name}}.yml
@@ -29,7 +29,7 @@ jobs:
  {%- if database %}
  services:
  postgres:
- image: postgres
+ image: postgres:16
  env:
  POSTGRES_PASSWORD: admin
  POSTGRES_USER: postgres