Skip to content

Commit

Permalink
revert: remove double_contract_state_error diagnostic
Browse files Browse the repository at this point in the history
  • Loading branch information
dj8yf0μl committed Feb 17, 2025
1 parent 1f3c071 commit caa15dc
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 38 deletions.
17 changes: 0 additions & 17 deletions near-sdk-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,6 @@ fn has_nested_near_macros(item: TokenStream) -> bool {
.is_some()
}

fn check_duplicate_contract_state() -> bool {
static CONTRACT_STATE_DEFINED: ::std::sync::atomic::AtomicBool =
::std::sync::atomic::AtomicBool::new(false);

CONTRACT_STATE_DEFINED.swap(true, ::std::sync::atomic::Ordering::AcqRel)
}

#[proc_macro_attribute]
pub fn near(attr: TokenStream, item: TokenStream) -> TokenStream {
if attr.to_string().contains("event_json") {
Expand Down Expand Up @@ -111,16 +104,6 @@ pub fn near(attr: TokenStream, item: TokenStream) -> TokenStream {
let mut expanded: proc_macro2::TokenStream = quote! {};

if near_macro_args.contract_state.unwrap_or(false) {
if check_duplicate_contract_state() {
return TokenStream::from(
syn::Error::new(
Span::call_site(),
"Contract state can only be defined once per crate",
)
.to_compile_error(),
);
}

if let Some(metadata) = near_macro_args.contract_metadata {
expanded = quote! {#[#near_sdk_crate::near_bindgen(#metadata)]}
} else {
Expand Down
1 change: 0 additions & 1 deletion near-sdk/compilation_tests/all.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,4 @@ fn compilation_tests() {
t.pass("compilation_tests/contract_metadata_bindgen.rs");
t.pass("compilation_tests/types.rs");
t.compile_fail("compilation_tests/nested_near_error.rs");
t.compile_fail("compilation_tests/double_contract_state_error.rs");
}
13 changes: 0 additions & 13 deletions near-sdk/compilation_tests/double_contract_state_error.rs

This file was deleted.

7 changes: 0 additions & 7 deletions near-sdk/compilation_tests/double_contract_state_error.stderr

This file was deleted.

0 comments on commit caa15dc

Please sign in to comment.