Skip to content

Commit

Permalink
fix(p2p): order invalidation packet (#774)
Browse files Browse the repository at this point in the history
* return proper packet type

* test to assert packet type

* log/penalize data integrity error (taken from #756)
  • Loading branch information
moshababo authored Dec 26, 2018
1 parent e102bfd commit 962124f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions lib/p2p/NodeList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export const reputationEventWeight = {
[ReputationEvent.SwapSuccess]: 1,
[ReputationEvent.InvalidPacket]: -10,
[ReputationEvent.UnknownPacketType]: -20,
[ReputationEvent.PacketDataIntegrityError]: -20,
[ReputationEvent.MaxParserBufferSizeExceeded]: -20,
};

Expand Down
4 changes: 4 additions & 0 deletions lib/p2p/Peer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,10 @@ class Peer extends EventEmitter {
this.logger.warn(`parser: unknown peer packet type: ${err.payload}`);
this.emit('reputation', ReputationEvent.UnknownPacketType);
break;
case ParserErrorType.DataIntegrityError:
this.logger.warn(`parser: packet data integrity error: ${err.payload}`);
this.emit('reputation', ReputationEvent.PacketDataIntegrityError);
break;
case ParserErrorType.MaxBufferSizeExceeded:
this.logger.warn(`parser: max buffer size exceeded: ${err.payload}`);
this.emit('reputation', ReputationEvent.MaxParserBufferSizeExceeded);
Expand Down
4 changes: 2 additions & 2 deletions lib/p2p/packets/types/OrderInvalidationPacket.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class OrderInvalidationPacket extends Packet<OrderInvalidationPacketBody> {
);
}

private static convert = (obj: pb.OrderInvalidationPacket.AsObject): OrderPacket => {
return new OrderPacket({
private static convert = (obj: pb.OrderInvalidationPacket.AsObject): OrderInvalidationPacket => {
return new OrderInvalidationPacket({
header: {
id: obj.id,
hash: obj.hash,
Expand Down
1 change: 1 addition & 0 deletions lib/types/enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export enum ReputationEvent {
MaxParserBufferSizeExceeded = 5,
InvalidPacket = 6,
UnknownPacketType = 7,
PacketDataIntegrityError = 8,
}

export enum SwapFailureReason {
Expand Down
3 changes: 2 additions & 1 deletion test/unit/Parser.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ describe('Parser', () => {
return new Promise((resolve, reject) => {
wait(packets.length)
.then((parsedPackets) => {
for (let i = 0; i <= packets.length; i += 1) {
for (let i = 0; i < packets.length; i += 1) {
expect(packets[i]).to.deep.equal(parsedPackets[i]);
expect(packets[i].type).to.equal(parsedPackets[i].type);
}
resolve();
})
Expand Down

0 comments on commit 962124f

Please sign in to comment.