Merge pull request #129 from JustinDrake/master

Minor cleanups

Author: cpacia

api/restapi.py

@@ -562,7 +562,7 @@ def handle_response(resp, contract):
                                              indent=4))
                     request.finish()
                 else:
-                    request.write(json.dumps({"success": False, "reason": "seller rejected contract"}, indent=4))
+                    request.write(json.dumps({"success": False, "reason": "vendor rejected contract"}, indent=4))
                     request.finish()
             options = None
             if "options" in request.args:
@@ -588,8 +588,8 @@ def get_node(node):
                 else:
                     request.write(json.dumps({"success": False, "reason": "unable to reach vendor"}, indent=4))
                     request.finish()
-            seller_guid = unhexlify(c.contract["vendor_offer"]["listing"]["id"]["guid"])
-            self.kserver.resolve(seller_guid).addCallback(get_node)
+            vendor_guid = unhexlify(c.contract["vendor_offer"]["listing"]["id"]["guid"])
+            self.kserver.resolve(vendor_guid).addCallback(get_node)
             return server.NOT_DONE_YET
         except Exception, e:
             request.write(json.dumps({"success": False, "reason": e.message}, indent=4))

dht/network.py

@@ -398,7 +398,7 @@ def saveStateRegularly(self, fname, frequency=600):
 
         Args:
             fname: File name to save retularly to
-            frequencey: Frequency in seconds that the state should be saved.
+            frequency: Frequency in seconds that the state should be saved.
                         By default, 10 minutes.
         """
         loop = LoopingCall(self.saveState, fname)

dht/node.py

@@ -71,7 +71,7 @@ def __init__(self, node, maxsize):
         """
         Constructor.
 
-        @param node: The node to measure all distnaces from.
+        @param node: The node to measure all distances from.
         @param maxsize: The maximum size that this heap can grow to.
         """
         self.node = node

market/__init__.py

@@ -1,5 +1,5 @@
 __author__ = 'chris'
 """
 Package for two way communication between nodes.
-Primarily used for buyer-seller communication.
+Primarily used for buyer-vendor communication.
 """

market/contracts.py

@@ -517,7 +517,7 @@ def add_order_confirmation(self,
 
     def accept_order_confirmation(self, notification_listener, confirmation_json=None):
         """
-        Validate the order confirmation sent over from the seller and update our node accordingly.
+        Validate the order confirmation sent over from the vendor and update our node accordingly.
         """
         self.notification_listener = notification_listener
         try:

protos/message.proto

@@ -11,46 +11,46 @@ import "objects.proto";
 
 //This is the message structure for OpenBazaar messages going over the wire
 message Message {
-	required bytes messageID        = 1;
-	required Node sender            = 2;
-	required Command command        = 3;
-	required uint32 protoVer        = 4;
-	repeated bytes arguments        = 5;
-	optional bool testnet           = 6 [default = false];
+    required bytes messageID        = 1;
+    required Node sender            = 2;
+    required Command command        = 3;
+    required uint32 protoVer        = 4;
+    repeated bytes arguments        = 5;
+    optional bool testnet           = 6 [default = false];
 }
 
 //A list of commands accepted by nodes
 enum Command {
-	PING                    = 1;
-	STUN                    = 2;
-	HOLE_PUNCH              = 3;
-	STORE                   = 4;
-	DELETE                  = 5;
-	INV					    = 6;
-	VALUES                  = 7;
-	BROADCAST               = 8;
-	MESSAGE                 = 9;
-	FOLLOW                  = 10;
-	UNFOLLOW                = 11;
-	ORDER                   = 12;
-	ORDER_CONFIRMATION      = 13;
-	COMPLETE_ORDER          = 14;
-	FIND_NODE               = 15;
-	FIND_VALUE              = 16;
-	GET_CONTRACT            = 17;
-	GET_IMAGE               = 18;
-	GET_PROFILE             = 19;
-	GET_LISTINGS            = 20;
-	GET_USER_METADATA       = 21;
-	GET_CONTRACT_METADATA   = 22;
-	GET_FOLLOWING           = 23;
-	GET_FOLLOWERS           = 24;
-	DISPUTE_OPEN            = 25;
-	DISPUTE_CLOSE           = 26;
+    PING                    = 1;
+    STUN                    = 2;
+    HOLE_PUNCH              = 3;
+    STORE                   = 4;
+    DELETE                  = 5;
+    INV                     = 6;
+    VALUES                  = 7;
+    BROADCAST               = 8;
+    MESSAGE                 = 9;
+    FOLLOW                  = 10;
+    UNFOLLOW                = 11;
+    ORDER                   = 12;
+    ORDER_CONFIRMATION      = 13;
+    COMPLETE_ORDER          = 14;
+    FIND_NODE               = 15;
+    FIND_VALUE              = 16;
+    GET_CONTRACT            = 17;
+    GET_IMAGE               = 18;
+    GET_PROFILE             = 19;
+    GET_LISTINGS            = 20;
+    GET_USER_METADATA       = 21;
+    GET_CONTRACT_METADATA   = 22;
+    GET_FOLLOWING           = 23;
+    GET_FOLLOWERS           = 24;
+    DISPUTE_OPEN            = 25;
+    DISPUTE_CLOSE           = 26;
 
-	// Error responses
-	BAD_REQUEST             = 400;
-	NOT_FOUND               = 404;
-	CALM_DOWN               = 420;
-	UNKNOWN_ERROR           = 520;
-}
+    // Error responses
+    BAD_REQUEST             = 400;
+    NOT_FOUND               = 404;
+    CALM_DOWN               = 420;
+    UNKNOWN_ERROR           = 520;
+}

protos/objects.proto

@@ -13,16 +13,16 @@ import "countries.proto";
 //Some fields are optional as they aren't needed in all situations.
 message Node {
     required bytes guid             = 1;
-	required bytes signedPublicKey  = 2; // <64 byte signature><32 byte public key>
-	required NATType natType        = 3;
-	required IPAddress nodeAddress  = 4;
-	optional IPAddress relayAddress = 5;
-	optional bool vendor            = 6 [default = false];
-
-	message IPAddress {
-	    required string ip    = 1;
-	    required uint32 port  = 2;
-	}
+        required bytes signedPublicKey  = 2; // <64 byte signature><32 byte public key>
+        required NATType natType        = 3;
+        required IPAddress nodeAddress  = 4;
+        optional IPAddress relayAddress = 5;
+        optional bool vendor            = 6 [default = false];
+
+        message IPAddress {
+            required string ip    = 1;
+            required uint32 port  = 2;
+        }
 }
 
 enum NATType {
@@ -36,9 +36,9 @@ enum NATType {
 //Typically a list of these will be returned for any given keyword.
 message Value {
     optional bytes keyword        = 1;
-	required bytes valueKey       = 2;
-	required bytes serializedData = 3;
-	required uint32 ttl           = 4;
+        required bytes valueKey       = 2;
+        required bytes serializedData = 3;
+        required uint32 ttl           = 4;
 }
 
 //A list of these is sent in an INV packet
@@ -73,23 +73,23 @@ message Profile {
         optional bytes avatar_hash        = 22;
         optional bytes header_hash        = 23;
 
-	// Social media account for the profile
+        // Social media account for the profile
     message SocialAccount {
-    	required SocialType type  = 1;
-    	required string username  = 2;
-    	optional string proof_url = 3;
-
-    	enum SocialType {
-			FACEBOOK  = 1;
-			TWITTER   = 2;
-			INSTAGRAM = 3;
-			SNAPCHAT  = 4;
-    	}
+            required SocialType type  = 1;
+            required string username  = 2;
+            optional string proof_url = 3;
+
+            enum SocialType {
+                        FACEBOOK  = 1;
+                        TWITTER   = 2;
+                        INSTAGRAM = 3;
+                        SNAPCHAT  = 4;
+            }
     }
 
     message PublicKey {
-    	required bytes public_key = 1;
-    	required bytes signature  = 2;
+            required bytes public_key = 1;
+            required bytes signature  = 2;
     }
 }
 
@@ -163,4 +163,4 @@ message PlaintextMessage {
         ORDER_CONFIRMATION   = 4;
         RECEIPT              = 5;
     }
-}
+}