Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions linera-execution/src/execution_state_actor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,17 +414,14 @@ where
ExecutionError::UnauthorizedHttpRequest(url)
);

#[cfg_attr(web, allow(unused_mut))]
let mut request = Client::new()
let request = Client::new()
.request(request.method.into(), url)
.body(request.body)
.headers(headers);
#[cfg(not(web))]
{
request = request.timeout(linera_base::time::Duration::from_millis(
committee.policy().http_request_timeout_ms,
));
}
let request = request.timeout(linera_base::time::Duration::from_millis(
committee.policy().http_request_timeout_ms,
));

let response = request.send().await?;

Expand Down
6 changes: 1 addition & 5 deletions linera-execution/src/test_utils/mock_application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use std::{
collections::VecDeque,
fmt::{self, Debug, Display, Formatter},
mem,
sync::{
atomic::{AtomicUsize, Ordering},
Arc, Mutex,
Expand All @@ -15,10 +14,7 @@ use std::{

#[cfg(web)]
use js_sys::wasm_bindgen;
use linera_base::{
data_types::StreamUpdate,
identifiers::{ChainId, StreamId},
};
use linera_base::data_types::StreamUpdate;

use crate::{
ContractSyncRuntimeHandle, ExecutionError, ServiceSyncRuntimeHandle, UserContract,
Expand Down
18 changes: 6 additions & 12 deletions linera-execution/src/test_utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// Copyright (c) Zefchain Labs, Inc.
// SPDX-License-Identifier: Apache-2.0

// Some of these items are only used by some tests, but Rust will complain about unused
// items for the tests where they aren't used
#![allow(unused_imports)]

mod mock_application;
#[cfg(with_revm)]
pub mod solidity;
Expand All @@ -13,28 +9,26 @@ mod system_execution_state;
use std::{collections::BTreeMap, sync::Arc, thread, vec};

use linera_base::{
crypto::{AccountPublicKey, BcsSignable, CryptoHash, ValidatorPublicKey},
crypto::{AccountPublicKey, ValidatorPublicKey},
data_types::{
Amount, Blob, BlockHeight, ChainDescription, ChainOrigin, CompressedBytecode, Epoch,
InitialChainConfig, OracleResponse, Timestamp,
},
identifiers::{AccountOwner, ApplicationId, BlobId, BlobType, ChainId, ModuleId},
identifiers::{AccountOwner, ApplicationId, BlobId, ChainId, ModuleId},
ownership::ChainOwnership,
vm::VmRuntime,
};
use linera_views::{context::Context, views::View, ViewError};
use linera_views::{context::Context, views::View};
use proptest::{prelude::any, strategy::Strategy};
use serde::{Deserialize, Serialize};

pub use self::{
mock_application::{ExpectedCall, MockApplication, MockApplicationInstance},
system_execution_state::SystemExecutionState,
};
use crate::{
committee::Committee, execution_state_actor::ExecutionRequest, ApplicationDescription,
ExecutionRuntimeContext, ExecutionStateView, MessageContext, OperationContext, QueryContext,
ServiceRuntimeEndpoint, ServiceRuntimeRequest, ServiceSyncRuntime, SystemExecutionStateView,
TestExecutionRuntimeContext,
committee::Committee, ApplicationDescription, ExecutionRuntimeContext, ExecutionStateView,
MessageContext, OperationContext, QueryContext, ServiceRuntimeEndpoint, ServiceSyncRuntime,
SystemExecutionStateView,
};

pub fn dummy_committee() -> Committee {
Expand Down
16 changes: 4 additions & 12 deletions linera-execution/src/test_utils/system_execution_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
use std::{
collections::{BTreeMap, BTreeSet},
ops::Not,
sync::Arc,
};

use custom_debug_derive::Debug;
Expand All @@ -15,21 +14,14 @@ use linera_base::{
ownership::ChainOwnership,
};
use linera_views::{
context::{Context, MemoryContext},
random::generate_test_namespace,
context::MemoryContext,
views::{CryptoHashView, View},
ViewError,
};

use super::{
dummy_chain_description, dummy_committees, AccountPublicKey, MockApplication,
RegisterMockApplication, ValidatorPublicKey,
};
use super::{dummy_chain_description, dummy_committees, MockApplication, RegisterMockApplication};
use crate::{
committee::Committee, execution::UserAction, ApplicationDescription, ExecutionError,
ExecutionRuntimeConfig, ExecutionRuntimeContext, ExecutionStateView, OperationContext,
ResourceControlPolicy, ResourceController, ResourceTracker, TestExecutionRuntimeContext,
UserContractCode,
committee::Committee, ApplicationDescription, ExecutionRuntimeConfig, ExecutionRuntimeContext,
ExecutionStateView, TestExecutionRuntimeContext,
};

/// A system execution state, not represented as a view but as a simple struct.
Expand Down
2 changes: 1 addition & 1 deletion linera-rpc/src/grpc/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ where
}

fn log_request_outcome_and_latency(start: Instant, success: bool, method_name: &str) {
#![allow(unused_variables)]
#![cfg_attr(not(with_metrics), allow(unused_variables))]
#[cfg(with_metrics)]
{
metrics::SERVER_REQUEST_LATENCY_PER_REQUEST_TYPE
Expand Down
Loading