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.

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

Jump to bottom

fix: interface module bindings #1219

Merged
merged 10 commits into from
Sep 13, 2022
Merged

fix: interface module bindings #1219

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fdd63da
fix: interface module bindings
Niraj-Kamdar Sep 8, 2022
a079c5d
fix: uri parameter type and lifetime
Niraj-Kamdar Sep 8, 2022
713f7e3
fix(schema-bind): tests
Niraj-Kamdar Sep 8, 2022
f4681d6
Merge remote-tracking branch 'upstream/origin-dev' into nk/fix-interf…
Niraj-Kamdar Sep 9, 2022
39289a8
Merge remote-tracking branch 'upstream/origin-dev' into nk/fix-interf…
Niraj-Kamdar Sep 9, 2022
e5340fa
fix: tests
Niraj-Kamdar Sep 9, 2022
2afe87d
fix: tests
Niraj-Kamdar Sep 9, 2022
c3b7018
chore: increase timeout
Niraj-Kamdar Sep 9, 2022
9d699ed
Merge remote-tracking branch 'upstream/origin-dev' into nk/fix-interf…
Niraj-Kamdar Sep 12, 2022
782f650
fix(client-js): wasm-as tests
Niraj-Kamdar Sep 12, 2022
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
31 changes: 30 additions & 1 deletion packages/schema/bind/src/bindings/rust/wasm/templates/imported/module-type/mod-rs.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ use {{crate}}::{{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeywor
{{/propertyDeps.length}}

#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {}
pub struct {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
{{#isInterface}}uri: &'static str{{/isInterface}}
}

{{^isInterface}}
impl {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
pub const URI: &'static str = "{{uri}}";

Expand All @@ -51,3 +54,29 @@ impl {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
{{/last}}
{{/methods}}
}
{{/isInterface}}
{{#isInterface}}
impl {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
pub const INTERFACE_URI: &'static str = "{{uri}}";

pub fn new(uri: &'static str) -> {{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} {
{{#detectKeyword}}{{#toUpper}}{{type}}{{/toUpper}}{{/detectKeyword}} { uri: uri }
}

{{#methods}}
pub fn {{#toLower}}{{name}}{{/toLower}}(&self, args: &Args{{#toUpper}}{{name}}{{/toUpper}}) -> Result<{{#return}}{{#toWasm}}{{toGraphQLType}}{{/toWasm}}{{/return}}, String> {
let uri = self.uri;
let args = serialize_{{#toLower}}{{name}}{{/toLower}}_args(args).map_err(|e| e.to_string())?;
let result = subinvoke::wrap_subinvoke(
uri,
"{{name}}",
args,
)?;
deserialize_{{#toLower}}{{name}}{{/toLower}}_result(result.as_slice()).map_err(|e| e.to_string())
}
{{^last}}

{{/last}}
{{/methods}}
}
{{/isInterface}}
18 changes: 10 additions & 8 deletions packages/test-cases/cases/bind/sanity/output/wasm-rs/imported/test_import_module/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,19 @@ use crate::TestImportObject;
use crate::TestImportEnum;

#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct TestImportModule {}
pub struct TestImportModule {
uri: &'static str
}

impl TestImportModule {
pub const URI: &'static str = "testimport.uri.eth";
pub const INTERFACE_URI: &'static str = "testimport.uri.eth";

pub fn new() -> TestImportModule {
TestImportModule {}
pub fn new(uri: &'static str) -> TestImportModule {
TestImportModule { uri: uri }
}

pub fn imported_method(args: &ArgsImportedMethod) -> Result<Option<TestImportObject>, String> {
let uri = TestImportModule::URI;
pub fn imported_method(&self, args: &ArgsImportedMethod) -> Result<Option<TestImportObject>, String> {
let uri = self.uri;
let args = serialize_imported_method_args(args).map_err(|e| e.to_string())?;
let result = subinvoke::wrap_subinvoke(
uri,
Expand All @@ -42,8 +44,8 @@ impl TestImportModule {
deserialize_imported_method_result(result.as_slice()).map_err(|e| e.to_string())
}

pub fn another_method(args: &ArgsAnotherMethod) -> Result<i32, String> {
let uri = TestImportModule::URI;
pub fn another_method(&self, args: &ArgsAnotherMethod) -> Result<i32, String> {
let uri = self.uri;
let args = serialize_another_method_args(args).map_err(|e| e.to_string())?;
let result = subinvoke::wrap_subinvoke(
uri,
Expand Down