From 0db9a805bde5050060913462299690020ff798a0 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@bitpay.com>
Date: Tue, 22 Oct 2013 05:43:38 -0400
Subject: Revert "Switch to using raw_utf8"

This reverts commit 2ecb7555a9df1e843fd25f588819e4ca1d94b266.
---
 src/test/base58_tests.cpp      | 10 +++++-----
 src/test/script_tests.cpp      |  4 ++--
 src/test/transaction_tests.cpp |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/test')

diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index c435becc61..05675685bd 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -20,7 +20,7 @@ BOOST_AUTO_TEST_CASE(base58_EncodeBase58)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, raw_utf8);
+        std::string strTest = write_string(tv, false);
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -43,7 +43,7 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        std::string strTest = write_string(tv, raw_utf8);
+        std::string strTest = write_string(tv, false);
         if (test.size() < 2) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -113,7 +113,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, raw_utf8);
+        std::string strTest = write_string(tv, false);
         if (test.size() < 3) // Allow for extra stuff (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -169,7 +169,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, raw_utf8);
+        std::string strTest = write_string(tv, false);
         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, raw_utf8);
+        std::string strTest = write_string(tv, false);
         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
index 079cc49f60..32be914414 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(script_valid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, raw_utf8);
+        string strTest = write_string(tv, false);
         if (test.size() < 2) // Allow size > 2; extra stuff ignored (useful for comments)
         {
             BOOST_ERROR("Bad test: " << strTest);
@@ -142,7 +142,7 @@ BOOST_AUTO_TEST_CASE(script_invalid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, raw_utf8);
+        string strTest = write_string(tv, false);
         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
index d68ead1cd0..5dfb67cbe4 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(tx_valid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, raw_utf8);
+        string strTest = write_string(tv, false);
         if (test[0].type() == array_type)
         {
             if (test.size() != 3 || test[1].type() != str_type || test[2].type() != bool_type)
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE(tx_invalid)
     BOOST_FOREACH(Value& tv, tests)
     {
         Array test = tv.get_array();
-        string strTest = write_string(tv, raw_utf8);
+        string strTest = write_string(tv, false);
         if (test[0].type() == array_type)
         {
             if (test.size() != 3 || test[1].type() != str_type || test[2].type() != bool_type)
-- 
cgit v1.2.3