typo

shouhuas · Feb 8, 2017 · 4bad327 · 4bad327
1 parent 9038123
commit 4bad327
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/channel_test.sh b/channel_test.sh
@@ -35,8 +35,8 @@ sleep 1
 curl -i -d '["dice", 1000, [127,0,0,1], 3020]' http://localhost:3011 # "dice"
 sleep 1
 
-curl -i -d '["channel_solo_close", 2]' http://localhost:3011 # "dice"
-sleep 1
+#curl -i -d '["channel_solo_close", 2]' http://localhost:3011 # "dice"
+#sleep 1
 
 #curl -i -d '["mine_block", 1, 1000000]' http://localhost:3021
 #sleep 1

diff --git a/src/consensus/txs/channel_solo_close.erl b/src/consensus/txs/channel_solo_close.erl
@@ -84,7 +84,7 @@ next_ss(From, TheirSS, SPK, Acc1, Acc2, Accounts, Channels) ->
     Height = block:height(block:read(top:doit())),
     NewHeight = Height + 1,
     State = chalang:new_state(0, Height, Slash, 0, Accounts, Channels),
-    {Amount1, Nonce1} = spk:run(safe, OurSS, SPK, NewHeight, Slash, Accounts, Channels),
+    {Amount1, Nonce1} = spk:run(safe, [OurSS], SPK, NewHeight, Slash, Accounts, Channels),
     [_|[OurSecret|_]] = free_constants:vm(OurSS, State),
     Out1 = {Amount1, Nonce1, OurSS, OurSecret},
     Height = block:height(block:read(top:doit())),

diff --git a/src/networking/internal_handler.erl b/src/networking/internal_handler.erl
@@ -61,13 +61,13 @@ doit({dice, Amount, IP, Port}) ->
     SPK = testnet_sign:data(SSPK2),
     SS1 = dice:make_ss(SPK, Secret),
     {ok, SSPKsimple, TheirSecret} = talker:talk({dice, 2, MyID, SSPK2, SS1}, IP, Port), %SSPKsimple doesn't include the bet. the result of the bet instead is recorded.
-
+    ok;
 %comment below this line for testing channel_slash txs.
-    SS = dice:resolve_ss(SPK, Secret, TheirSecret),%
-    SSPK2simple = channel_feeder:agree_simplification(dice, SSPKsimple, SS),
-    SPKsimple = testnet_sign:data(SSPKsimple),
-    SPKsimple = testnet_sign:data(SSPK2simple),
-    talker:talk({dice, 3, MyID, SSPK2simple}, IP, Port);
+    %SS = dice:resolve_ss(SPK, Secret, TheirSecret),%
+    %SSPK2simple = channel_feeder:agree_simplification(dice, SSPKsimple, SS),
+    %SPKsimple = testnet_sign:data(SSPKsimple),
+    %SPKsimple = testnet_sign:data(SSPK2simple),
+    %talker:talk({dice, 3, MyID, SSPK2simple}, IP, Port);
 doit({channel_solo_close, Other}) ->
     Fee = free_constants:tx_fee(),
     {Accounts,Channels,_,_} = tx_pool:data(),