renaming in ScriptEvaluation, BlockrTransactionRepository support tes…

…tnet
MetacoSA · Oct 19, 2014 · 01cf148 · 01cf148
1 parent 5b69064
commit 01cf148
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/NBitcoin/BlockrTransactionRepository.cs b/NBitcoin/BlockrTransactionRepository.cs
@@ -33,10 +33,21 @@ public string Status
 	public class BlockrTransactionRepository : ITransactionRepository
 	{
 		public BlockrTransactionRepository()
+			: this(null)
 		{
 
 		}
+		public BlockrTransactionRepository(Network network)
+		{
+			if(network == null)
+				Network = Network.Main;
+		}
 
+		public Network Network
+		{
+			get;
+			set;
+		}
 
 
 		#region ITransactionRepository Members
@@ -46,7 +57,7 @@ public Transaction Get(uint256 txId)
 			while(true)
 			{
 				WebClient client = new WebClient();
-				var result = client.DownloadString("http://btc.blockr.io/api/v1/tx/raw/" + txId);
+				var result = client.DownloadString("http://" + (Network == Network.Main ? "" : "t") + "btc.blockr.io/api/v1/tx/raw/" + txId);
 				var json = JObject.Parse(result);
 				var status = json["status"];
 				var code = json["code"];
@@ -61,7 +72,7 @@ public Transaction Get(uint256 txId)
 
 		public void Put(uint256 txId, Transaction tx)
 		{
-			
+
 		}
 
 		#endregion

diff --git a/NBitcoin/ScriptEvaluationContext.cs b/NBitcoin/ScriptEvaluationContext.cs
@@ -66,10 +66,9 @@ public bool VerifyScript(Script scriptSig, Script scriptPubKey, Transaction txTo
 				if(evaluationCopy.Stack.Count == 0)
 					throw new InvalidProgramException("stackCopy cannot be empty here");
 
-				var pubKeySerialized = evaluationCopy.Stack.Pop();
-				Script pubKey2 = new Script(pubKeySerialized);
+				Script redeem = new Script(evaluationCopy.Stack.Pop());
 
-				if(!evaluationCopy.EvalScript(pubKey2, txTo, nIn))
+				if(!evaluationCopy.EvalScript(redeem, txTo, nIn))
 					return false;
 
 				return evaluationCopy.Result != null && evaluationCopy.Result.Value;