From f25ee986b9785e7567a710604cc4e5915afe1c57 Mon Sep 17 00:00:00 2001 From: Gijs Van Laer Date: Wed, 11 Sep 2019 10:54:16 -0400 Subject: [PATCH] nizk: fix pythontests --- py/libbolt.py | 4 ++-- py/tests.py | 8 ++++---- src/ffishim.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/py/libbolt.py b/py/libbolt.py index f477e71..083d360 100644 --- a/py/libbolt.py +++ b/py/libbolt.py @@ -86,7 +86,7 @@ class Libbolt(object): def bidirectional_init_merchant(self, channel_state, b0_merch, name): output_string = self.lib.ffishim_bidirectional_init_merchant(channel_state.encode(), b0_merch, name.encode()) output_dictionary = ast.literal_eval(ctypes.cast(output_string, ctypes.c_char_p).value.decode('utf-8')) - return output_dictionary['channel_token'], output_dictionary['merch_state'] + return output_dictionary.get('channel_token'), output_dictionary.get('merch_state'), output_dictionary.get('channel_state') def bidirectional_init_customer(self, channel_state, channel_token, b0_cust, b0_merch, name): output_string = self.lib.ffishim_bidirectional_init_customer(channel_state.encode(), channel_token.encode(), b0_cust, b0_merch, name.encode()) @@ -229,7 +229,7 @@ def run_unit_test(): print("channel state new: ", len(channel_state)) - (channel_token, merch_state) = libbolt.bidirectional_init_merchant(channel_state, b0_merch, "Bob") + (channel_token, merch_state, channel_state) = libbolt.bidirectional_init_merchant(channel_state, b0_merch, "Bob") print("merch_state: ", len(merch_state)) #print("channel_token: ", type(_channel_token)) diff --git a/py/tests.py b/py/tests.py index 072a27f..1a79413 100644 --- a/py/tests.py +++ b/py/tests.py @@ -28,7 +28,7 @@ class BoltEstablishTests(unittest.TestCase): self.channel_state = self.bolt.channel_setup("Test Channel") self.b0_cust = 1000 self.b0_merch = 100 - (self.channel_token, self.merch_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") + (self.channel_token, self.merch_state, self.channel_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") (channel_token, self.cust_state) = self.bolt.bidirectional_init_customer(self.channel_state, self.channel_token, self.b0_cust, self.b0_merch, "Alice") @@ -148,7 +148,7 @@ class BoltPayTests(unittest.TestCase): self.channel_state = self.bolt.channel_setup("Test Channel") self.b0_cust = 500 self.b0_merch = 10 - (self.channel_token, self.merch_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") + (self.channel_token, self.merch_state, self.channel_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") (self.channel_token, self.cust_state) = self.bolt.bidirectional_init_customer(self.channel_state, self.channel_token, self.b0_cust, self.b0_merch, "Alice") @@ -254,7 +254,7 @@ class BoltMultiChannelTests(unittest.TestCase): self.channel_state = self.bolt.channel_setup("Test Channel") self.b0_alice = self.b0_charlie = 150 self.b0_merch = 5 - (self.channel_token, self.merch_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") + (self.channel_token, self.merch_state, self.channel_state) = self.bolt.bidirectional_init_merchant(self.channel_state, self.b0_merch, "Bob") (self.channel_token_a, self.alice_state) = self.bolt.bidirectional_init_customer(self.channel_state, self.channel_token, self.b0_alice, self.b0_merch, "Alice") @@ -282,7 +282,7 @@ class BoltMultiChannelTests(unittest.TestCase): def test_multiple_channels_work(self): """Establishing concurrent channels with a merchant works as expected """ - channel_token_a, alice_cust_state = self._establish_channel(self.channel_token, self.alice_state, self.b0_alice, self.merch_state) + channel_token_a, alice_cust_state = self._establish_channel(self.channel_token, self.alice_state, self.b0_alice, self.b0_merch) class BoltIntermediaryTests(unittest.TestCase): diff --git a/src/ffishim.rs b/src/ffishim.rs index 9adbcb7..906cac8 100644 --- a/src/ffishim.rs +++ b/src/ffishim.rs @@ -113,7 +113,7 @@ pub mod ffishim { let (channel_token, mut merch_state, mut channel_state) = bidirectional::init_merchant(rng, &mut channel_state, name); - let ser = ["{\'channel_token\':\'", serde_json::to_string(&channel_token).unwrap().as_str(), "\', \'merch_state\':\'", serde_json::to_string(&merch_state).unwrap().as_str() ,"\'}"].concat(); + let ser = ["{\'channel_token\':\'", serde_json::to_string(&channel_token).unwrap().as_str(), "\', \'merch_state\':\'", serde_json::to_string(&merch_state).unwrap().as_str() ,"\', \'channel_state\':\'", serde_json::to_string(&channel_state).unwrap().as_str() ,"\'}"].concat(); let cser = CString::new(ser).unwrap(); cser.into_raw()