Skip to content

Commit

Permalink
fix transaction-builder-generator errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@nkysg
nkysg committed Oct 4, 2024
1 parent 30beee4 commit 57301ee
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 65 deletions.
9 changes: 4 additions & 5 deletions vm/transaction-builder-generator/src/common.rs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use heck::CamelCase;
use heck::ToUpperCamelCase;
use move_core_types::abi::{ScriptABI, ScriptFunctionABI};
use move_core_types::language_storage::TypeTag;
use serde_reflection::{ContainerFormat, Format, Named, VariantFormat};
use starcoin_vm_types::transaction::{
ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI,
};
use starcoin_vm_types::transaction::{ArgumentABI, TransactionScriptABI, TypeArgumentABI};
use std::collections::{BTreeMap, BTreeSet};

/// Name of the Move `u256` type in the serde registry
Expand Down Expand Up @@ -73,7 +72,7 @@ pub(crate) fn make_abi_enum_container(abis: &[ScriptABI]) -> ContainerFormat {
variants.insert(
index as u32,
Named {
name: abi.name().to_camel_case(),
name: abi.name().to_upper_camel_case(),
value: format,
},
);
Expand Down
6 changes: 2 additions & 4 deletions vm/transaction-builder-generator/src/cpp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
// SPDX-License-Identifier: Apache-2.0

use crate::common;
use move_core_types::abi::{ScriptABI, ScriptFunctionABI};
use move_core_types::{
account_address::AccountAddress,
language_storage::{ModuleId, TypeTag},
};
use serde_generate::indent::{IndentConfig, IndentedWriter};
use starcoin_vm_types::transaction::{
ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI,
};

use starcoin_vm_types::transaction::{ArgumentABI, TransactionScriptABI, TypeArgumentABI};
use std::{
io::{Result, Write},
path::PathBuf,
Expand Down
10 changes: 5 additions & 5 deletions vm/transaction-builder-generator/src/csharp.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fn write_script_call_files(
} else {
"ScriptFunctionCall".to_string()
});
paths.push(abi.name().to_camel_case());
paths.push(abi.name().to_upper_camel_case());
(paths, prepare_doc_string(abi.doc()))
})
.collect();
Expand Down Expand Up @@ -411,7 +411,7 @@ return new TransactionPayload.ScriptFunction(
writeln!(
self.out,
"return new ScriptCall.{0}(",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
let mut params = String::from("");
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
Expand Down Expand Up @@ -462,7 +462,7 @@ return new TransactionPayload.ScriptFunction(
writeln!(
self.out,
"return new ScriptFunctionCall.{0}(",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
let mut params = String::from("");
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
Expand Down Expand Up @@ -534,7 +534,7 @@ private static System.Collections.Generic.Dictionary<Type, ScriptEncodingHelper>
ScriptCall.{0} obj = (ScriptCall.{0})call;
return Helpers.encode_{1}_script({2});
}}));",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down Expand Up @@ -572,7 +572,7 @@ private static System.Collections.Generic.Dictionary<Type, ScriptFunctionEncodin
ScriptFunctionCall.{0} obj = (ScriptFunctionCall.{0})call;
return Helpers.encode_{1}_script_function({2});
}}));",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down
20 changes: 9 additions & 11 deletions vm/transaction-builder-generator/src/dart.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// SPDX-License-Identifier: Apache-2.0

use crate::common;
use heck::{ToShoutySnakeCase, ToUpperCamelCase};
use move_core_types::abi::{ScriptABI, ScriptFunctionABI};
use move_core_types::{
account_address::AccountAddress,
language_storage::{ModuleId, TypeTag},
Expand All @@ -11,11 +13,7 @@ use serde_generate::{
indent::{IndentConfig, IndentedWriter},
CodeGeneratorConfig,
};
use starcoin_vm_types::transaction::{
ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI,
};

use heck::{CamelCase, ShoutySnakeCase};
use starcoin_vm_types::transaction::{ArgumentABI, TransactionScriptABI, TypeArgumentABI};
use std::{
collections::BTreeMap,
io::{Result, Write},
Expand Down Expand Up @@ -132,7 +130,7 @@ fn write_script_call_files(
}
.to_string(),
);
paths.push(abi.name().to_camel_case());
paths.push(abi.name().to_upper_camel_case());
(paths, prepare_doc_string(abi.doc()))
})
.collect();
Expand Down Expand Up @@ -410,7 +408,7 @@ return TransactionPayloadScriptFunctionItem(ScriptFunction(module,function,ty_ar
writeln!(
self.out,
"ScriptCall.{0}.Builder builder = new ScriptCall.{0}.Builder();",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
Expand Down Expand Up @@ -462,7 +460,7 @@ return TransactionPayloadScriptFunctionItem(ScriptFunction(module,function,ty_ar
// writeln!(
// self.out,
// "ScriptFunctionCall.{0}.Builder builder = new ScriptFunctionCall.{0}.Builder();",
// abi.name().to_camel_case(),
// abi.name().to_upper_camel_case(),
// )?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
Expand All @@ -484,7 +482,7 @@ return TransactionPayloadScriptFunctionItem(ScriptFunction(module,function,ty_ar
writeln!(
self.out,
"return ScriptFunctionCall{0}Item(",
abi.name().to_camel_case()
abi.name().to_upper_camel_case()
)?;
self.out.indent();

Expand Down Expand Up @@ -531,7 +529,7 @@ static Map<String, ScriptEncodingHelper> initTransactionScriptEncoderMap() {{"#
ScriptCall{0}Item obj = (ScriptCall{0}Item)call;
return Helpers.encode_{1}_script({2});
}};",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down Expand Up @@ -568,7 +566,7 @@ static Map<String, ScriptFunctionEncodingHelper> initScriptFunctionEncoderMap()
ScriptFunctionCall{0}Item obj = call as ScriptFunctionCall{0}Item;
return Helpers.encode_{1}_script_function({2});
}};",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down
26 changes: 13 additions & 13 deletions vm/transaction-builder-generator/src/golang.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ where
} else {
"ScriptFunctionCall".to_string()
},
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
],
crate::common::prepare_doc_string(abi.doc()),
)
Expand Down Expand Up @@ -185,14 +185,14 @@ func EncodeScript(call ScriptCall) diemtypes.Script {{"#
let params = std::iter::empty()
.chain(abi.ty_args().iter().map(TypeArgumentABI::name))
.chain(abi.args().iter().map(ArgumentABI::name))
.map(|name| format!("call.{}", name.to_camel_case()))
.map(|name| format!("call.{}", name.to_upper_camel_case()))
.collect::<Vec<_>>()
.join(", ");
writeln!(
self.out,
r#"case *ScriptCall__{0}:
return Encode{0}Script({1})"#,
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
params,
)?;
}
Expand All @@ -217,14 +217,14 @@ func EncodeScriptFunction(call ScriptFunctionCall) diemtypes.TransactionPayload
let params = std::iter::empty()
.chain(abi.ty_args().iter().map(TypeArgumentABI::name))
.chain(abi.args().iter().map(ArgumentABI::name))
.map(|name| format!("call.{}", name.to_camel_case()))
.map(|name| format!("call.{}", name.to_upper_camel_case()))
.collect::<Vec<_>>()
.join(", ");
writeln!(
self.out,
r#"case *ScriptFunctionCall__{0}:
return Encode{0}ScriptFunction({1})"#,
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
params,
)?;
}
Expand Down Expand Up @@ -282,7 +282,7 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
self.out,
"\n{}\nfunc Encode{}Script({}) diemtypes.Script {{",
Self::quote_doc(abi.doc()),
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
[
Self::quote_type_parameters(abi.ty_args()),
Self::quote_parameters(abi.args()),
Expand Down Expand Up @@ -311,7 +311,7 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
self.out,
"\n{}\nfunc Encode{}ScriptFunction({}) diemtypes.TransactionPayload {{",
Self::quote_doc(abi.doc()),
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
[
Self::quote_type_parameters(abi.ty_args()),
Self::quote_parameters(abi.args()),
Expand Down Expand Up @@ -359,13 +359,13 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
writeln!(
self.out,
"var call ScriptCall__{0}",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
self.out,
"call.{} = script.TyArgs[{}]",
ty_arg.name().to_camel_case(),
ty_arg.name().to_upper_camel_case(),
index,
)?;
}
Expand All @@ -380,7 +380,7 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
"#,
common::mangle_type(arg.type_tag()),
index,
arg.name().to_camel_case(),
arg.name().to_upper_camel_case(),
)?;
}
writeln!(self.out, "return &call, nil")?;
Expand Down Expand Up @@ -416,13 +416,13 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
writeln!(
self.out,
"var call ScriptFunctionCall__{0}",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
self.out,
"call.{} = script.Value.TyArgs[{}]",
ty_arg.name().to_camel_case(),
ty_arg.name().to_upper_camel_case(),
index,
)?;
}
Expand All @@ -437,7 +437,7 @@ func DecodeScriptFunctionPayload(script diemtypes.TransactionPayload) (ScriptFun
"#,
common::mangle_type(arg.type_tag()),
index,
arg.name().to_camel_case(),
arg.name().to_upper_camel_case(),
)?;
}
writeln!(self.out, "return &call, nil")?;
Expand Down
18 changes: 9 additions & 9 deletions vm/transaction-builder-generator/src/java.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ use serde_generate::{
indent::{IndentConfig, IndentedWriter},
java, CodeGeneratorConfig,
};
use starcoin_vm_types::transaction::{
ArgumentABI, ScriptABI, ScriptFunctionABI, TransactionScriptABI, TypeArgumentABI,
};
use starcoin_vm_types::transaction::{ArgumentABI, TransactionScriptABI, TypeArgumentABI};

use heck::{CamelCase, ShoutySnakeCase};
use heck::ToShoutySnakeCase;
use heck::ToUpperCamelCase;
use move_core_types::abi::{ScriptABI, ScriptFunctionABI};
use std::{
collections::BTreeMap,
io::{Result, Write},
Expand Down Expand Up @@ -124,7 +124,7 @@ fn write_script_call_files(
}
.to_string(),
);
paths.push(abi.name().to_camel_case());
paths.push(abi.name().to_upper_camel_case());
(paths, prepare_doc_string(abi.doc()))
})
.collect();
Expand Down Expand Up @@ -416,7 +416,7 @@ return builder.build();"#,
writeln!(
self.out,
"ScriptCall.{0}.Builder builder = new ScriptCall.{0}.Builder();",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
Expand Down Expand Up @@ -468,7 +468,7 @@ return builder.build();"#,
writeln!(
self.out,
"ScriptFunctionCall.{0}.Builder builder = new ScriptFunctionCall.{0}.Builder();",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
)?;
for (index, ty_arg) in abi.ty_args().iter().enumerate() {
writeln!(
Expand Down Expand Up @@ -526,7 +526,7 @@ private static java.util.Map<Class<?>, ScriptEncodingHelper> initTransactionScri
ScriptCall.{0} obj = (ScriptCall.{0})call;
return Helpers.encode_{1}_script({2});
}}));",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down Expand Up @@ -566,7 +566,7 @@ private static java.util.Map<Class<?>, ScriptFunctionEncodingHelper> initScriptF
ScriptFunctionCall.{0} obj = (ScriptFunctionCall.{0})call;
return Helpers.encode_{1}_script_function({2});
}}));",
abi.name().to_camel_case(),
abi.name().to_upper_camel_case(),
abi.name(),
params,
)?;
Expand Down
2 changes: 1 addition & 1 deletion vm/transaction-builder-generator/src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Copyright (c) The Diem Core Contributors
// SPDX-License-Identifier: Apache-2.0

use move_core_types::abi::ScriptABI;
use serde_generate::CustomCode;
use starcoin_vm_types::language_storage::TypeTag;
use starcoin_vm_types::transaction::ScriptABI;
use std::{ffi::OsStr, fs, io::Read, path::Path};

/// Support for code-generation in C++17.
Expand Down
Loading

0 comments on commit 57301ee

Please sign in to comment.