Merge pull request #2135 from larryk85/enhancement/general_user_experience

Enhancement: Better error message for set contract in cleos

programs/cleos/main.cpp

@@ -823,20 +823,22 @@ int main( int argc, char** argv ) {
       std::string wast;
       std::cout << localized("Reading WAST...") << std::endl;
       fc::path cpath(contractPath);
+
       if( cpath.filename().generic_string() == "." ) cpath = cpath.parent_path();
 
-      if( wastPath == string() )
+      if( wastPath.empty() )
       {
          wastPath = (cpath / (cpath.filename().generic_string()+".wast")).generic_string();
       }
 
-      if( abiPath == string() )
+      if( abiPath.empty() )
       {
          abiPath = (cpath / (cpath.filename().generic_string()+".abi")).generic_string();
       }
-
+      
+      
       fc::read_file_contents(wastPath, wast);
-
+      FC_ASSERT( !wast.empty(), "no wast file found ${f}", ("f", wastPath) );
       vector<uint8_t> wasm;
       const string binary_wasm_header("\x00\x61\x73\x6d", 4);
       if(wast.compare(0, 4, binary_wasm_header) == 0) {