Skip to content

use base upward #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
drsk0 merged 4 commits into from
Oct 14, 2025
Merged

use base upward #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3e0c7b
concordium-base: update submodule
drsk0 Oct 9, 2025
2ecd8a4
concordium-base: update submodule
drsk0 Oct 13, 2025
c12dcf4
reexport upward module
Oct 9, 2025
b47f755
update known_or_else call sites
Oct 13, 2025
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
2 changes: 1 addition & 1 deletion concordium-base
Open in desktop
Submodule concordium-base updated 9 files
+213 −3 rust-src/concordium_base/src/common/cbor.rs
+2 −2 rust-src/concordium_base/src/common/cbor/decoder.rs
+1 −0 rust-src/concordium_base/src/common/mod.rs
+334 −0 rust-src/concordium_base/src/common/upward.rs
+30 −19 rust-src/concordium_base/src/protocol_level_tokens/token_event.rs
+16 −15 rust-src/concordium_base/src/protocol_level_tokens/token_operations.rs
+26 −22 rust-src/concordium_base/src/protocol_level_tokens/token_reject_reason.rs
+11 −9 rust-src/concordium_base/src/transactions.rs
+129 −45 rust-src/concordium_base_derive/src/cbor.rs
4 changes: 2 additions & 2 deletions src/contract_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ impl<Type> ContractInitBuilder<Type> {
.await?
.inner;

let data = match result.details.effects.known_or_else(|| {
let data = match result.details.effects.known_or_else(|_unknown| {
dry_run::DryRunError::CallError(tonic::Status::invalid_argument(
"Unexpected response from dry-running a contract initialization.",
))
Expand Down Expand Up @@ -580,7 +580,7 @@ impl ModuleDeployBuilder {
.await?
.inner;

let module_ref = match result.details.effects.known_or_else(|| {
let module_ref = match result.details.effects.known_or_else(|_unknown| {
dry_run::DryRunError::CallError(tonic::Status::invalid_argument(
"Unexpected response from dry-running a module deployment.",
))
Expand Down
3 changes: 1 addition & 2 deletions src/v2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use crate::{
},
};
use anyhow::Context;
pub use concordium_base::common::upward::{self, Upward};
use concordium_base::{
base::{
AccountIndex, BlockHeight, ChainParameterVersion0, ChainParameterVersion1,
Expand Down Expand Up @@ -51,13 +52,11 @@ pub use tonic::{
transport::{Endpoint, Error},
Code, Status,
};
pub use upward::Upward;

use self::dry_run::WithRemainingQuota;

mod conversions;
pub mod dry_run;
pub mod upward;
#[path = "generated/mod.rs"]
#[allow(
clippy::large_enum_variant,
Expand Down
290 changes: 0 additions & 290 deletions src/v2/upward.rs
View file
Open in desktop

This file was deleted.