X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fbitcoinrpc.cpp;h=30edbf42c607e6bea294de97e543439ab325e734;hb=9795536e660254a25984d0fc81a548eaf0e91c92;hp=dbbe67f1777d168c5cea2abdf9e52ba441b59819;hpb=8c8cd5f399c10e3670955dff8a7c22dd20934bb4;p=novacoin.git

diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index dbbe67f..30edbf4 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1802,51 +1802,6 @@ Value getmemorypool(const Array& params, bool fHelp)
 }
 
 
-// ppcoin: reset auto checkpoint
-Value resetcheckpoint(const Array& params, bool fHelp)
-{
-    if (fHelp || params.size() < 1 || params.size() > 1)
-        throw runtime_error(
-            "resetcheckpoint <checkpointheight>\n"
-            "Reset automatic checkpoint to specified height.\n"
-            "<checkpointheight> is the height of the new checkpoint block.\n");
-
-    int nCheckpoint = params[0].get_int();
-    if (nCheckpoint <= 0 || nCheckpoint >= nBestHeight)
-        throw runtime_error(
-            "invalid checkpoint height.\n"
-        );
-    if (nCheckpoint >= Checkpoints::nAutoCheckpoint)
-        throw runtime_error(
-            "new checkpoint must be earlier than current auto checkpoint.\n"
-        );
-    if (!Checkpoints::ResetAutoCheckpoint(nCheckpoint))
-        throw runtime_error(
-            "internal error - reset checkpoint failed.\n"
-        );
-
-    return Value::null;
-}
-
-
-// ppcoin: get branch point of alternative branch
-Value getbranchpoint(const Array& params, bool fHelp)
-{
-    if (fHelp || params.size() != 0)
-        throw runtime_error(
-            "getbranchpoint\n"
-            "Returns height of branch point of alternative branch.\n");
-
-    Object result;
-    if (Checkpoints::nBranchPoint > 0)
-        result.push_back(Pair("branchpoint", Checkpoints::nBranchPoint));
-    else
-        result.push_back(Pair("branchpoint", "none"));
-    result.push_back(Pair("checkpoint", Checkpoints::nAutoCheckpoint));
-    return result;
-}
-
-
 // ppcoin: reserve balance from being staked for network protection
 Value reservebalance(const Array& params, bool fHelp)
 {
@@ -2106,8 +2061,6 @@ pair<string, rpcfn_type> pCallTable[] =
     make_pair("settxfee",               &settxfee),
     make_pair("getmemorypool",          &getmemorypool),
     make_pair("listsinceblock",        &listsinceblock),
-    make_pair("resetcheckpoint",        &resetcheckpoint),
-    make_pair("getbranchpoint",         &getbranchpoint),
     make_pair("reservebalance",         &reservebalance),
     make_pair("checkwallet",            &checkwallet),
     make_pair("repairwallet",           &repairwallet),
@@ -2140,8 +2093,6 @@ string pAllowInSafeMode[] =
     "validateaddress",
     "getwork",
     "getmemorypool",
-    "resetcheckpoint",
-    "getbranchpoint",
 };
 set<string> setAllowInSafeMode(pAllowInSafeMode, pAllowInSafeMode + sizeof(pAllowInSafeMode)/sizeof(pAllowInSafeMode[0]));
 
@@ -2753,7 +2704,6 @@ int CommandLineRPC(int argc, char *argv[])
             params[1] = v.get_obj();
         }
         if (strMethod == "sendmany"                && n > 2) ConvertTo<boost::int64_t>(params[2]);
-        if (strMethod == "resetcheckpoint"         && n > 0) ConvertTo<boost::int64_t>(params[0]);
         if (strMethod == "reservebalance"          && n > 0) ConvertTo<bool>(params[0]);
         if (strMethod == "reservebalance"          && n > 1) ConvertTo<double>(params[1]);