From 9ce73740f7546a08c933660f80840c4809c008a1 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 29 Oct 2016 09:20:10 -0300
Subject: [PATCH] test

---
 src/chainparams.cpp     | 4 ++--
 src/chainparamsbase.cpp | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 2dd0831fe..e23826e4f 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -188,7 +188,7 @@ CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutput
     genesis.nVersion = nVersion;
     genesis.vtx.push_back(txNew);
     genesis.hashPrevBlock.SetNull();
-    genesis.hashMerkleRoot = BlockMerkleRoot(genesis);
+    genesis.hashMerkleRoot = txNew.GetHash();//BlockMerkleRoot(genesis);
     return genesis;
 }
 #define GENESIS_STRING "The Times 03/Jan/2009 Chancellor on brink of second bailout for banks"
@@ -249,7 +249,7 @@ void *chainparams_commandline(void *ptr)
     fprintf(stderr,">>>>>>>>>> %u: hash %s merkle %s timestamp.%u\n",*(uint32_t *)&mainParams.GenesisBlock().nNonce,mainParams.GenesisBlock().GetHash().ToString().c_str(),mainParams.GenesisBlock().hashMerkleRoot.ToString().c_str(),mainParams.GenesisBlock().nTime);
     
     //set_genesis_tip(hash);
-    SelectBaseParams(0);
+    SelectBaseParams(MAIN);
     //BaseParams().nRPCPort = ASSETCHAINS_PORT + 1;
     fprintf(stderr,">>>>>>>>>> %s: port.%u/%u magic.%08x %u nonce.%u time.%u nbits.%08x %u coins\n",ASSETCHAINS_SYMBOL,ASSETCHAINS_PORT,ASSETCHAINS_PORT+1,ASSETCHAINS_MAGIC,ASSETCHAINS_MAGIC,nonce,ASSETCHAINS_TIMESTAMP,GENESIS_NBITS,(uint32_t)ASSETCHAINS_SUPPLY);
     ASSETCHAIN_INIT = 1;
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
index c1ab23a90..0c75b69f4 100644
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -73,7 +73,6 @@ const CBaseChainParams& BaseParams()
 void SelectBaseParams(CBaseChainParams::Network network)
 {
     switch (network) {
-    case 0:
     case CBaseChainParams::MAIN:
         pCurrentBaseParams = &mainParams;
         break;