Skip to content

Commit

Permalink
Move marketplace version in build API to 0_99 (#3920)
Browse files Browse the repository at this point in the history
Co-authored-by: tbro <[email protected]>
  • Loading branch information
tbro and tbro authored Nov 25, 2024
1 parent c28fbd4 commit bd0ec68
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion crates/builder-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ pub mod v0_2 {
pub use super::v0_1::*;
pub type Version = vbs::version::StaticVersion<0, 2>;
}
pub mod v0_3;
pub mod v0_99;
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ pub mod data_source;
/// No changes to this module
pub use super::v0_1::query_data;

pub type Version = vbs::version::StaticVersion<0, 3>;
pub type Version = vbs::version::StaticVersion<0, 99>;
6 changes: 3 additions & 3 deletions crates/task-impls/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ pub mod v0_2 {
}

/// Version 0.3: marketplace. Bundles.
pub mod v0_3 {
pub use hotshot_builder_api::v0_3::Version;
pub mod v0_99 {
pub use hotshot_builder_api::v0_99::Version;
use hotshot_types::{
bundle::Bundle, constants::MARKETPLACE_BUILDER_MODULE,
traits::node_implementation::NodeType, vid::VidCommitment,
Expand All @@ -235,7 +235,7 @@ pub mod v0_3 {
pub use super::BuilderClientError;

/// Client for builder API
pub type BuilderClient<TYPES> = super::BuilderClient<TYPES, StaticVersion<0, 3>>;
pub type BuilderClient<TYPES> = super::BuilderClient<TYPES, StaticVersion<0, 99>>;

impl<TYPES: NodeType> BuilderClient<TYPES> {
/// Claim block
Expand Down
2 changes: 1 addition & 1 deletion crates/task-impls/src/transactions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use vec1::Vec1;

use crate::{
builder::{
v0_1::BuilderClient as BuilderClientBase, v0_3::BuilderClient as BuilderClientMarketplace,
v0_1::BuilderClient as BuilderClientBase, v0_99::BuilderClient as BuilderClientMarketplace,
},
events::{HotShotEvent, HotShotTaskCompleted},
helpers::broadcast_event,
Expand Down
6 changes: 3 additions & 3 deletions crates/testing/src/block_builder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use hotshot_builder_api::{
block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo},
builder::{Error, Options},
},
v0_3,
v0_99,
};
use hotshot_types::{
constants::{LEGACY_BUILDER_MODULE, MARKETPLACE_BUILDER_MODULE},
Expand Down Expand Up @@ -84,15 +84,15 @@ pub fn run_builder_source<TYPES, Source>(
<Source as ReadState>::State: Sync
+ Send
+ v0_1::data_source::BuilderDataSource<TYPES>
+ v0_3::data_source::BuilderDataSource<TYPES>,
+ v0_99::data_source::BuilderDataSource<TYPES>,
{
spawn(async move {
let start_builder = |url: Url, source: Source| -> _ {
let builder_api_0_1 = hotshot_builder_api::v0_1::builder::define_api::<Source, TYPES>(
&Options::default(),
)
.expect("Failed to construct the builder API");
let builder_api_0_3 = hotshot_builder_api::v0_3::builder::define_api::<Source, TYPES>(
let builder_api_0_3 = hotshot_builder_api::v0_99::builder::define_api::<Source, TYPES>(
&Options::default(),
)
.expect("Failed to construct the builder API");
Expand Down
6 changes: 3 additions & 3 deletions crates/testing/src/block_builder/simple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use hotshot_builder_api::{
block_info::{AvailableBlockData, AvailableBlockHeaderInput, AvailableBlockInfo},
builder::{BuildError, Error, Options},
},
v0_3,
v0_99,
};
use hotshot_types::{
bundle::Bundle,
Expand Down Expand Up @@ -132,7 +132,7 @@ impl<TYPES: NodeType> ReadState for SimpleBuilderSource<TYPES> {
}

#[async_trait]
impl<TYPES: NodeType> v0_3::data_source::BuilderDataSource<TYPES> for SimpleBuilderSource<TYPES>
impl<TYPES: NodeType> v0_99::data_source::BuilderDataSource<TYPES> for SimpleBuilderSource<TYPES>
where
<TYPES as NodeType>::InstanceState: Default,
{
Expand Down Expand Up @@ -342,7 +342,7 @@ impl<TYPES: NodeType> SimpleBuilderSource<TYPES> {
>(&Options::default())
.expect("Failed to construct the builder API");

let builder_api_0_3 = hotshot_builder_api::v0_3::builder::define_api::<
let builder_api_0_3 = hotshot_builder_api::v0_99::builder::define_api::<
SimpleBuilderSource<TYPES>,
TYPES,
>(&Options::default())
Expand Down

0 comments on commit bd0ec68

Please sign in to comment.