remove Message from dummy account

This commit is contained in:
zixuanzh 2019-03-30 19:12:31 -04:00
parent f5af4b9016
commit ec7bc45a58

View File

@ -1,12 +1,12 @@
import asyncio import asyncio
import uuid
import multiaddr import multiaddr
from libp2p import new_node from libp2p import new_node
from libp2p.pubsub.message import create_message_talk from libp2p.pubsub.pb import rpc_pb2_grpc
from libp2p.pubsub.pb import rpc_pb2
from libp2p.pubsub.pubsub import Pubsub from libp2p.pubsub.pubsub import Pubsub
from libp2p.pubsub.floodsub import FloodSub from libp2p.pubsub.floodsub import FloodSub
from libp2p.pubsub.message import MessageTalk
from libp2p.pubsub.message import generate_message_id
SUPPORTED_PUBSUB_PROTOCOLS = ["/floodsub/1.0.0"] SUPPORTED_PUBSUB_PROTOCOLS = ["/floodsub/1.0.0"]
CRYPTO_TOPIC = "ethereum" CRYPTO_TOPIC = "ethereum"
@ -53,16 +53,15 @@ class DummyAccountNode():
Handle all incoming messages on the CRYPTO_TOPIC from peers Handle all incoming messages on the CRYPTO_TOPIC from peers
""" """
while True: while True:
message_raw = await self.q.get() incoming = await self.q.get()
message = create_message_talk(message_raw) rpc_incoming = rpc_pb2.RPC()
contents = message.data rpc_incoming.ParseFromString(incoming)
for message in rpc_incoming.publish:
msg_comps = contents.split(",") msg_comps = message.split(",")
if msg_comps[0] == "send":
if msg_comps[0] == "send": self.handle_send_crypto(msg_comps[1], msg_comps[2], int(msg_comps[3]))
self.handle_send_crypto(msg_comps[1], msg_comps[2], int(msg_comps[3])) elif msg_comps[0] == "set":
elif msg_comps[0] == "set": self.handle_set_crypto_for_user(msg_comps[1], int(msg_comps[2]))
self.handle_set_crypto_for_user(msg_comps[1], int(msg_comps[2]))
async def setup_crypto_networking(self): async def setup_crypto_networking(self):
""" """
@ -82,8 +81,8 @@ class DummyAccountNode():
""" """
my_id = str(self.libp2p_node.get_id()) my_id = str(self.libp2p_node.get_id())
msg_contents = "send," + source_user + "," + dest_user + "," + str(amount) msg_contents = "send," + source_user + "," + dest_user + "," + str(amount)
msg = MessageTalk(my_id, my_id, [CRYPTO_TOPIC], msg_contents, generate_message_id()) packet = generate_RPC_packet(my_id, [CRYPTO_TOPIC], msg_contents, generate_message_id())
await self.floodsub.publish(my_id, msg.to_str()) await self.floodsub.publish(my_id, msg.SerializeToString())
async def publish_set_crypto(self, user, amount): async def publish_set_crypto(self, user, amount):
""" """
@ -93,8 +92,9 @@ class DummyAccountNode():
""" """
my_id = str(self.libp2p_node.get_id()) my_id = str(self.libp2p_node.get_id())
msg_contents = "set," + user + "," + str(amount) msg_contents = "set," + user + "," + str(amount)
msg = MessageTalk(my_id, my_id, [CRYPTO_TOPIC], msg_contents, generate_message_id()) packet = generate_RPC_packet(my_id, [CRYPTO_TOPIC], msg_contents, generate_message_id())
await self.floodsub.publish(my_id, msg.to_str())
await self.floodsub.publish(my_id, packet.SerializeToString())
def handle_send_crypto(self, source_user, dest_user, amount): def handle_send_crypto(self, source_user, dest_user, amount):
""" """
@ -132,3 +132,26 @@ class DummyAccountNode():
else: else:
return -1 return -1
def generate_message_id():
"""
Generate a unique message id
:return: messgae id
"""
return str(uuid.uuid1())
def generate_RPC_packet(origin_id, topics, msg_content, msg_id):
packet = rpc_pb2.RPC()
packet.publish.extend([rpc_pb2.Message(
from_id=origin_id.encode('utf-8'),
seqno=msg_id.encode('utf-8'),
data=msg_content.encode('utf-8'),
topicIDs=topics.encode('utf-8'))
])
for topic in topics:
packet.subscriptions.extend([rpc_pb2.RPC.SubOpts(
subscribe=True,
topicid = topic.encode('utf-8')
)])
return packet