Update service schema, remove feature gates from test. (#2439)

linera-service-graphql-client/gql/service_schema.graphql

@@ -207,27 +207,27 @@ type ChainStateExtendedView {
 	Hashes of all certified blocks for this sender.
 	This ends with `block_hash` and has length `usize::from(next_block_height)`.
 	"""
-	confirmedLog: LogView_CryptoHash_b0541e41!
+	confirmedLog: LogView_CryptoHash_20eccc8d!
 	"""
 	Sender chain and height of all certified blocks known as a receiver (local ordering).
 	"""
-	receivedLog: LogView_ChainAndHeight_de85b393!
+	receivedLog: LogView_ChainAndHeight_c25ecaa6!
 	"""
 	Mailboxes used to receive messages indexed by their origin.
 	"""
-	inboxes: ReentrantCollectionView_Origin_InboxStateView_2059505700!
+	inboxes: ReentrantCollectionView_Origin_InboxStateView_3485213288!
 	"""
 	A queue of unskippable bundles, with the timestamp when we added them to the inbox.
 	"""
-	unskippableBundles: QueueView_TimestampedBundleInInbox_c9bca311!
+	unskippableBundles: QueueView_TimestampedBundleInInbox_cdcf52b8!
 	"""
 	Unskippable bundles that have been removed but are still in the queue.
 	"""
 	removedUnskippableBundles: [BundleInInbox!]!
 	"""
 	Mailboxes used to send messages, indexed by their target.
 	"""
-	outboxes: ReentrantCollectionView_Target_OutboxStateView_3775022202!
+	outboxes: ReentrantCollectionView_Target_OutboxStateView_4197956612!
 	"""
 	Number of outgoing messages in flight for each block height.
 	We use a `RegisterView` to prioritize speed for small maps.
@@ -236,7 +236,7 @@ type ChainStateExtendedView {
 	"""
 	Channels able to multicast messages to subscribers.
 	"""
-	channels: ReentrantCollectionView_ChannelFullName_ChannelStateView_1259684418!
+	channels: ReentrantCollectionView_ChannelFullName_ChannelStateView_4201533849!
 }
 
 """
@@ -291,7 +291,7 @@ type ChannelStateView {
 	"""
 	The block heights so far, to be sent to future subscribers.
 	"""
-	blockHeights: LogView_BlockHeight_a5612a40!
+	blockHeights: LogView_BlockHeight_db6bcc27!
 }
 
 """
@@ -357,15 +357,15 @@ scalar Destination
 """
 A GraphQL-visible map item, complete with key.
 """
-type Entry_ChannelFullName_ChannelStateView_3a04511c {
+type Entry_ChannelFullName_ChannelStateView_84ad3897 {
 	key: ChannelFullName!
 	value: ChannelStateView!
 }
 
 """
 A GraphQL-visible map item, complete with key.
 """
-type Entry_Origin_InboxStateView_79f3e1f3 {
+type Entry_Origin_InboxStateView_7fb40df6 {
 	key: Origin!
 	value: InboxStateView!
 }
@@ -381,7 +381,7 @@ type Entry_Owner_Amount_771b9c6c {
 """
 A GraphQL-visible map item, complete with key.
 """
-type Entry_Target_OutboxStateView_f3778d1a {
+type Entry_Target_OutboxStateView_bc6210d6 {
 	key: Target!
 	value: OutboxStateView!
 }
@@ -459,12 +459,12 @@ type InboxStateView {
 	"""
 	These bundles have been added and are waiting to be removed.
 	"""
-	addedBundles: QueueView_MessageBundle_f33fd73d!
+	addedBundles: QueueView_MessageBundle_86d6cf45!
 	"""
 	These bundles have been removed by anticipation and are waiting to be added.
 	At least one of `added_bundles` and `removed_bundles` should be empty.
 	"""
-	removedBundles: QueueView_MessageBundle_f33fd73d!
+	removedBundles: QueueView_MessageBundle_86d6cf45!
 }
 
 """
@@ -491,15 +491,15 @@ A scalar that can represent any JSON Object value.
 """
 scalar JSONObject
 
-type LogView_BlockHeight_a5612a40 {
+type LogView_BlockHeight_db6bcc27 {
 	entries(start: Int, end: Int): [BlockHeight!]!
 }
 
-type LogView_ChainAndHeight_de85b393 {
+type LogView_ChainAndHeight_c25ecaa6 {
 	entries(start: Int, end: Int): [ChainAndHeight!]!
 }
 
-type LogView_CryptoHash_b0541e41 {
+type LogView_CryptoHash_20eccc8d {
 	entries(start: Int, end: Int): [CryptoHash!]!
 }
 
@@ -535,7 +535,7 @@ input MapInput_Target_16f15470 {
 	filters: MapFilters_Target_6fda9ea4
 }
 
-type MapView_Owner_Amount_0d73ec3f {
+type MapView_Owner_Amount_798b2a71 {
 	keys(count: Int): [Owner!]!
 	entry(key: Owner!): Entry_Owner_Amount_771b9c6c!
 	entries(input: MapInput_Owner_2b9cd89a): [Entry_Owner_Amount_771b9c6c!]!
@@ -718,7 +718,7 @@ type OutboxStateView {
 	Keep sending these certified blocks of ours until they are acknowledged by
 	receivers.
 	"""
-	queue: QueueView_BlockHeight_f5d50b5f!
+	queue: QueueView_BlockHeight_ebfa8266!
 }
 
 """
@@ -773,15 +773,15 @@ type QueryRoot {
 	version: VersionInfo!
 }
 
-type QueueView_BlockHeight_f5d50b5f {
+type QueueView_BlockHeight_ebfa8266 {
 	entries(count: Int): [BlockHeight!]!
 }
 
-type QueueView_MessageBundle_f33fd73d {
+type QueueView_MessageBundle_86d6cf45 {
 	entries(count: Int): [MessageBundle!]!
 }
 
-type QueueView_TimestampedBundleInInbox_c9bca311 {
+type QueueView_TimestampedBundleInInbox_cdcf52b8 {
 	entries(count: Int): [TimestampedBundleInInbox!]!
 }
 
@@ -790,22 +790,22 @@ The recipient of a transfer
 """
 scalar Recipient
 
-type ReentrantCollectionView_ChannelFullName_ChannelStateView_1259684418 {
+type ReentrantCollectionView_ChannelFullName_ChannelStateView_4201533849 {
 	keys: [ChannelFullName!]!
-	entry(key: ChannelFullName!): Entry_ChannelFullName_ChannelStateView_3a04511c!
-	entries(input: MapInput_ChannelFullName_3aa4320a): [Entry_ChannelFullName_ChannelStateView_3a04511c!]!
+	entry(key: ChannelFullName!): Entry_ChannelFullName_ChannelStateView_84ad3897!
+	entries(input: MapInput_ChannelFullName_3aa4320a): [Entry_ChannelFullName_ChannelStateView_84ad3897!]!
 }
 
-type ReentrantCollectionView_Origin_InboxStateView_2059505700 {
+type ReentrantCollectionView_Origin_InboxStateView_3485213288 {
 	keys: [Origin!]!
-	entry(key: Origin!): Entry_Origin_InboxStateView_79f3e1f3!
-	entries(input: MapInput_Origin_08662377): [Entry_Origin_InboxStateView_79f3e1f3!]!
+	entry(key: Origin!): Entry_Origin_InboxStateView_7fb40df6!
+	entries(input: MapInput_Origin_08662377): [Entry_Origin_InboxStateView_7fb40df6!]!
 }
 
-type ReentrantCollectionView_Target_OutboxStateView_3775022202 {
+type ReentrantCollectionView_Target_OutboxStateView_4197956612 {
 	keys: [Target!]!
-	entry(key: Target!): Entry_Target_OutboxStateView_f3778d1a!
-	entries(input: MapInput_Target_16f15470): [Entry_Target_OutboxStateView_f3778d1a!]!
+	entry(key: Target!): Entry_Target_OutboxStateView_bc6210d6!
+	entries(input: MapInput_Target_16f15470): [Entry_Target_OutboxStateView_bc6210d6!]!
 }
 
 """
@@ -911,7 +911,7 @@ type SystemExecutionStateView {
 	committees: JSONObject!
 	ownership: ChainOwnership!
 	balance: Amount!
-	balances: MapView_Owner_Amount_0d73ec3f!
+	balances: MapView_Owner_Amount_798b2a71!
 	timestamp: Timestamp!
 }
 

linera-service-graphql-client/tests/test.rs

@@ -7,10 +7,10 @@
     feature = "scylladb"
 ))]
 
-use std::{collections::BTreeMap, io::Read, str::FromStr, sync::LazyLock, time::Duration};
+use std::{collections::BTreeMap, str::FromStr, sync::LazyLock, time::Duration};
 
 use fungible::{FungibleTokenAbi, InitialState};
-use linera_base::{command::resolve_binary, data_types::Amount, identifiers::ChainId};
+use linera_base::{data_types::Amount, identifiers::ChainId};
 use linera_service::cli_wrappers::{
     local_net::{Database, LocalNetConfig, ProcessInbox},
     LineraNet, LineraNetConfig, Network,
@@ -19,9 +19,8 @@ use linera_service_graphql_client::{
     applications, block, blocks, chains, request, transfer, Applications, Block, Blocks, Chains,
     Transfer,
 };
-use tempfile::tempdir;
 use test_case::test_case;
-use tokio::{process::Command, sync::Mutex};
+use tokio::sync::Mutex;
 
 /// A static lock to prevent integration tests from running in parallel.
 pub static INTEGRATION_TEST_GUARD: LazyLock<Mutex<()>> = LazyLock::new(|| Mutex::new(()));
@@ -142,22 +141,3 @@ async fn test_end_to_end_queries(config: impl LineraNetConfig) {
     node_service.ensure_is_running().unwrap();
     net.terminate().await.unwrap();
 }
-
-#[test_log::test(tokio::test)]
-async fn test_check_service_schema() {
-    let tmp_dir = tempdir().unwrap();
-    let path = resolve_binary("linera-schema-export", "linera-service")
-        .await
-        .unwrap();
-    let mut command = Command::new(path);
-    let output = command.current_dir(tmp_dir.path()).output().await.unwrap();
-    let service_schema = String::from_utf8(output.stdout).unwrap();
-    let mut file_base = std::fs::File::open("gql/service_schema.graphql").unwrap();
-    let mut graphql_schema = String::new();
-    file_base.read_to_string(&mut graphql_schema).unwrap();
-    assert_eq!(
-        graphql_schema, service_schema,
-        "\nGraphQL service schema has changed -> \
-         regenerate schema following steps in linera-service-graphql-client/README.md\n"
-    )
-}

linera-service-graphql-client/tests/test_check_service_schema.rs

@@ -0,0 +1,27 @@
+// Copyright (c) Zefchain Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::io::Read;
+
+use linera_base::command::resolve_binary;
+use tempfile::tempdir;
+use tokio::process::Command;
+
+#[test_log::test(tokio::test)]
+async fn test_check_service_schema() {
+    let tmp_dir = tempdir().unwrap();
+    let path = resolve_binary("linera-schema-export", "linera-service")
+        .await
+        .unwrap();
+    let mut command = Command::new(path);
+    let output = command.current_dir(tmp_dir.path()).output().await.unwrap();
+    let service_schema = String::from_utf8(output.stdout).unwrap();
+    let mut file_base = std::fs::File::open("gql/service_schema.graphql").unwrap();
+    let mut graphql_schema = String::new();
+    file_base.read_to_string(&mut graphql_schema).unwrap();
+    assert_eq!(
+        graphql_schema, service_schema,
+        "\nGraphQL service schema has changed -> \
+         regenerate schema following steps in linera-service-graphql-client/README.md\n"
+    )
+}