Switch to using raw_utf8

constantined · constantined · commit 2ecb7555a9df · 2013-07-23T04:51:29.000+03:00
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -497,7 +497,7 @@ string JSONRPCRequest(const string& strMethod, const Array& params, const Value&
     request.push_back(Pair("method", strMethod));
     request.push_back(Pair("params", params));
     request.push_back(Pair("id", id));
-    return write_string(Value(request), false) + "\n";
+    return write_string(Value(request), raw_utf8) + "\n";
 }
 
 Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id)
@@ -515,7 +515,7 @@ Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id)
 string JSONRPCReply(const Value& result, const Value& error, const Value& id)
 {
     Object reply = JSONRPCReplyObj(result, error, id);
-    return write_string(Value(reply), false) + "\n";
+    return write_string(Value(reply), raw_utf8) + "\n";
 }
 
 void ErrorReply(std::ostream& stream, const Object& objError, const Value& id)
@@ -945,7 +945,7 @@ static string JSONRPCExecBatch(const Array& vReq)
     for (unsigned int reqIdx = 0; reqIdx < vReq.size(); reqIdx++)
         ret.push_back(JSONRPCExecOne(vReq[reqIdx]));
 
-    return write_string(Value(ret), false) + "\n";
+    return write_string(Value(ret), raw_utf8) + "\n";
 }
 
 void ServiceConnection(AcceptedConnection *conn)
@@ -1235,7 +1235,7 @@ int CommandLineRPC(int argc, char *argv[])
         if (error.type() != null_type)
         {
             // Error
-            strPrint = "error: " + write_string(error, false);
+            strPrint = "error: " + write_string(error, raw_utf8);
             int code = find_value(error.get_obj(), "code").get_int();
             nRet = abs(code);
         }
@@ -1247,7 +1247,7 @@ int CommandLineRPC(int argc, char *argv[])
             else if (result.type() == str_type)
                 strPrint = result.get_str();
             else
-                strPrint = write_string(result, true);
+                strPrint = write_string(result, pretty_print | raw_utf8);
         }
     }
     catch (boost::thread_interrupted) {
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -157,7 +157,7 @@ void RPCExecutor::request(const QString &command)
         else if (result.type() == json_spirit::str_type)
             strPrint = result.get_str();
         else
-            strPrint = write_string(result, true);
+            strPrint = write_string(result, json_spirit::pretty_print | json_spirit::raw_utf8);
 
         emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));
     }
@@ -171,7 +171,7 @@ void RPCExecutor::request(const QString &command)
         }
         catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message
         {   // Show raw JSON object
-            emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));
+            emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), json_spirit::raw_utf8)));
         }
     }
     catch (std::exception& e)
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(base58_EncodeBase58)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, false);
+        std::string strTest = write_string(tv, raw_utf8);
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, false);
+        std::string strTest = write_string(tv, raw_utf8);
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, false);
+        std::string strTest = write_string(tv, raw_utf8);
         if (test.size() < 3) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, false);
+        std::string strTest = write_string(tv, raw_utf8);
         if (test.size() < 3) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_invalid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, false);
+        std::string strTest = write_string(tv, raw_utf8);
         if (test.size() < 1) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(script_valid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, false);
+        string strTest = write_string(tv, raw_utf8);
         if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, false);
+        string strTest = write_string(tv, raw_utf8);
         if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
@@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, false);
+        string strTest = write_string(tv, raw_utf8);
         if (test[0].type() == array_type)
         {
             if (test.size() != 3 || test[1].type() != str_type || test[2].type() != bool_type)
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, false);
+        string strTest = write_string(tv, raw_utf8);
         if (test[0].type() == array_type)
         {
             if (test.size() != 3 || test[1].type() != str_type || test[2].type() != bool_type)

Original file line number	Diff line number	Diff line change
`@@ -497,7 +497,7 @@ string JSONRPCRequest(const string& strMethod, const Array& params, const Value&`
`497`	`497`	`request.push_back(Pair("method", strMethod));`
`498`	`498`	`request.push_back(Pair("params", params));`
`499`	`499`	`request.push_back(Pair("id", id));`
`500`		`- return write_string(Value(request), false) + "\n";`
	`500`	`+ return write_string(Value(request), raw_utf8) + "\n";`
`501`	`501`	`}`
`502`	`502`
`503`	`503`	`Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id)`
`@@ -515,7 +515,7 @@ Object JSONRPCReplyObj(const Value& result, const Value& error, const Value& id)`
`515`	`515`	`string JSONRPCReply(const Value& result, const Value& error, const Value& id)`
`516`	`516`	`{`
`517`	`517`	`Object reply = JSONRPCReplyObj(result, error, id);`
`518`		`- return write_string(Value(reply), false) + "\n";`
	`518`	`+ return write_string(Value(reply), raw_utf8) + "\n";`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`void ErrorReply(std::ostream& stream, const Object& objError, const Value& id)`
`@@ -945,7 +945,7 @@ static string JSONRPCExecBatch(const Array& vReq)`
`945`	`945`	`for (unsigned int reqIdx = 0; reqIdx < vReq.size(); reqIdx++)`
`946`	`946`	`ret.push_back(JSONRPCExecOne(vReq[reqIdx]));`
`947`	`947`
`948`		`- return write_string(Value(ret), false) + "\n";`
	`948`	`+ return write_string(Value(ret), raw_utf8) + "\n";`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`void ServiceConnection(AcceptedConnection *conn)`
`@@ -1235,7 +1235,7 @@ int CommandLineRPC(int argc, char *argv[])`
`1235`	`1235`	`if (error.type() != null_type)`
`1236`	`1236`	`{`
`1237`	`1237`	`// Error`
`1238`		`- strPrint = "error: " + write_string(error, false);`
	`1238`	`+ strPrint = "error: " + write_string(error, raw_utf8);`
`1239`	`1239`	`int code = find_value(error.get_obj(), "code").get_int();`
`1240`	`1240`	`nRet = abs(code);`
`1241`	`1241`	`}`
`@@ -1247,7 +1247,7 @@ int CommandLineRPC(int argc, char *argv[])`
`1247`	`1247`	`else if (result.type() == str_type)`
`1248`	`1248`	`strPrint = result.get_str();`
`1249`	`1249`	`else`
`1250`		`- strPrint = write_string(result, true);`
	`1250`	`+ strPrint = write_string(result, pretty_print \| raw_utf8);`
`1251`	`1251`	`}`
`1252`	`1252`	`}`
`1253`	`1253`	`catch (boost::thread_interrupted) {`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void RPCExecutor::request(const QString &command)`
`157`	`157`	`else if (result.type() == json_spirit::str_type)`
`158`	`158`	`strPrint = result.get_str();`
`159`	`159`	`else`
`160`		`- strPrint = write_string(result, true);`
	`160`	`+ strPrint = write_string(result, json_spirit::pretty_print \| json_spirit::raw_utf8);`
`161`	`161`
`162`	`162`	`emit reply(RPCConsole::CMD_REPLY, QString::fromStdString(strPrint));`
`163`	`163`	`}`
`@@ -171,7 +171,7 @@ void RPCExecutor::request(const QString &command)`
`171`	`171`	`}`
`172`	`172`	`catch(std::runtime_error &) // raised when converting to invalid type, i.e. missing code or message`
`173`	`173`	`{ // Show raw JSON object`
`174`		`- emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), false)));`
	`174`	`+ emit reply(RPCConsole::CMD_ERROR, QString::fromStdString(write_string(json_spirit::Value(objError), json_spirit::raw_utf8)));`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`catch (std::exception& e)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(base58_EncodeBase58)`
`19`	`19`	`BOOST_FOREACH(Value& tv, tests)`
`20`	`20`	`{`
`21`	`21`	`Array test = tv.get_array();`
`22`		`- std::string strTest = write_string(tv, false);`
	`22`	`+ std::string strTest = write_string(tv, raw_utf8);`
`23`	`23`	`if (test.size() < 2) // Allow for extra stuff (useful for comments)`
`24`	`24`	`{`
`25`	`25`	`BOOST_ERROR("Bad test: " << strTest);`
`@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)`
`42`	`42`	`BOOST_FOREACH(Value& tv, tests)`
`43`	`43`	`{`
`44`	`44`	`Array test = tv.get_array();`
`45`		`- std::string strTest = write_string(tv, false);`
	`45`	`+ std::string strTest = write_string(tv, raw_utf8);`
`46`	`46`	`if (test.size() < 2) // Allow for extra stuff (useful for comments)`
`47`	`47`	`{`
`48`	`48`	`BOOST_ERROR("Bad test: " << strTest);`
`@@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)`
`114`	`114`	`BOOST_FOREACH(Value& tv, tests)`
`115`	`115`	`{`
`116`	`116`	`Array test = tv.get_array();`
`117`		`- std::string strTest = write_string(tv, false);`
	`117`	`+ std::string strTest = write_string(tv, raw_utf8);`
`118`	`118`	`if (test.size() < 3) // Allow for extra stuff (useful for comments)`
`119`	`119`	`{`
`120`	`120`	`BOOST_ERROR("Bad test: " << strTest);`
`@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)`
`171`	`171`	`BOOST_FOREACH(Value& tv, tests)`
`172`	`172`	`{`
`173`	`173`	`Array test = tv.get_array();`
`174`		`- std::string strTest = write_string(tv, false);`
	`174`	`+ std::string strTest = write_string(tv, raw_utf8);`
`175`	`175`	`if (test.size() < 3) // Allow for extra stuff (useful for comments)`
`176`	`176`	`{`
`177`	`177`	`BOOST_ERROR("Bad test: " << strTest);`
`@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_invalid)`
`240`	`240`	`BOOST_FOREACH(Value& tv, tests)`
`241`	`241`	`{`
`242`	`242`	`Array test = tv.get_array();`
`243`		`- std::string strTest = write_string(tv, false);`
	`243`	`+ std::string strTest = write_string(tv, raw_utf8);`
`244`	`244`	`if (test.size() < 1) // Allow for extra stuff (useful for comments)`
`245`	`245`	`{`
`246`	`246`	`BOOST_ERROR("Bad test: " << strTest);`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ BOOST_AUTO_TEST_CASE(script_valid)`
`131`	`131`	`BOOST_FOREACH(Value& tv, tests)`
`132`	`132`	`{`
`133`	`133`	`Array test = tv.get_array();`
`134`		`- string strTest = write_string(tv, false);`
	`134`	`+ string strTest = write_string(tv, raw_utf8);`
`135`	`135`	`if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments)`
`136`	`136`	`{`
`137`	`137`	`BOOST_ERROR("Bad test: " << strTest);`
`@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)`
`155`	`155`	`BOOST_FOREACH(Value& tv, tests)`
`156`	`156`	`{`
`157`	`157`	`Array test = tv.get_array();`
`158`		`- string strTest = write_string(tv, false);`
	`158`	`+ string strTest = write_string(tv, raw_utf8);`
`159`	`159`	`if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments)`
`160`	`160`	`{`
`161`	`161`	`BOOST_ERROR("Bad test: " << strTest);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)`
`27`	`27`	`BOOST_FOREACH(Value& tv, tests)`
`28`	`28`	`{`
`29`	`29`	`Array test = tv.get_array();`
`30`		`- string strTest = write_string(tv, false);`
	`30`	`+ string strTest = write_string(tv, raw_utf8);`
`31`	`31`	`if (test[0].type() == array_type)`
`32`	`32`	`{`
`33`	`33`	`if (test.size() != 3 \|\| test[1].type() != str_type \|\| test[2].type() != bool_type)`
`@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)`
`96`	`96`	`BOOST_FOREACH(Value& tv, tests)`
`97`	`97`	`{`
`98`	`98`	`Array test = tv.get_array();`
`99`		`- string strTest = write_string(tv, false);`
	`99`	`+ string strTest = write_string(tv, raw_utf8);`
`100`	`100`	`if (test[0].type() == array_type)`
`101`	`101`	`{`
`102`	`102`	`if (test.size() != 3 \|\| test[1].type() != str_type \|\| test[2].type() != bool_type)`