nizk: fix pythontests
This commit is contained in:
parent
3019ad28c9
commit
f25ee986b9
|
@ -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))
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue