Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Print the canonical path of wasm/abi when not found #6346

Merged
merged 2 commits into from
Nov 20, 2018
+2 −5
Merged

Print the canonical path of wasm/abi when not found #6346

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e68f96a
Print the canonical path of wasm/abi when not found
conr2d Nov 19, 2018
1641618
Remove unnecessary conversion of contractPath to empty path
conr2d Nov 20, 2018
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
4 changes: 2 additions & 2 deletions programs/cleos/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2468,7 +2468,7 @@ int main( int argc, char** argv ) {
bytes code_bytes;
if(!contract_clear){
std::string wasm;
fc::path cpath(contractPath);
fc::path cpath = fc::canonical(fc::path(contractPath));

if( cpath.filename().generic_string() == "." ) cpath = cpath.parent_path();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check should be before the conversion to canonical.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean "don't call canonical() when given path is already absolute path"? (By check whether the first character of contractPath is . ?)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 2473 checks if cpath is "." and if it is then it sets cpath to cpath.parent_path(). If you convert to canonical then cpath will never equal ".".

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see. Sorry for the stupid question. :)


Expand Down Expand Up @@ -2523,7 +2523,7 @@ int main( int argc, char** argv ) {

bytes abi_bytes;
if(!contract_clear){
fc::path cpath(contractPath);
fc::path cpath = fc::canonical(fc::path(contractPath));
if( cpath.filename().generic_string() == "." ) cpath = cpath.parent_path();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above, the check for "." should be before switch to canonical.


if( abiPath.empty() ) {
Expand Down