Skip to content
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.

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

Explicitly specify the trait in the dispatching #1131

Merged
merged 2 commits into from
Feb 13, 2022
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
2 changes: 1 addition & 1 deletion crates/lang/codegen/src/generator/dispatch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ impl Dispatch<'_> {

const CALLABLE: fn(&mut Self::Storage, Self::Input) -> Self::Output =
|storage, #input_tuple_bindings| {
#storage_ident::#message_ident( storage #( , #input_bindings )* )
<#storage_ident as #trait_path>::#message_ident( storage #( , #input_bindings )* )
};
const SELECTOR: [::core::primitive::u8; 4usize] = #selector;
const PAYABLE: ::core::primitive::bool = #payable;
Expand Down
43 changes: 43 additions & 0 deletions crates/lang/tests/ui/contract/pass/traits-messages-same-name.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
use ink_lang as ink;

#[ink::trait_definition]
pub trait TraitDefinition1 {
#[ink(message)]
fn message(&self);
}

#[ink::trait_definition]
pub trait TraitDefinition2 {
#[ink(message)]
fn message(&self);
}

#[ink::contract]
mod contract {
use super::{
TraitDefinition1,
TraitDefinition2,
};

#[ink(storage)]
pub struct Contract {}

impl Contract {
#[ink(constructor)]
pub fn constructor() -> Self {
Self {}
}
}

impl TraitDefinition1 for Contract {
#[ink(message)]
fn message(&self) {}
}

impl TraitDefinition2 for Contract {
#[ink(message)]
fn message(&self) {}
}
}

fn main() {}