Skip to content

Remove unnecessary awaits from sync functions #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattcphillips wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unnecessary awaits from sync functions #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ class BunnyBus extends EventEmitter {

const publishOptions = Helpers.buildPublishOrSendOptions(options, headers);

await channelContext.channel.publish(globalExchange, routeKey, convertedMessage.buffer, publishOptions);
channelContext.channel.publish(globalExchange, routeKey, convertedMessage.buffer, publishOptions);
await channelContext.channel.waitForConfirms();

$.emit(BunnyBus.PUBLISHED_EVENT, publishOptions, message);
Expand Down Expand Up @@ -560,7 +560,7 @@ class BunnyBus extends EventEmitter {
}
else {
// acking this directly to channel so events don't fire
await channelContext.channel.ack(payload);
channelContext.channel.ack(payload);
}
}
}
Expand Down Expand Up @@ -591,7 +591,7 @@ class BunnyBus extends EventEmitter {

const channelContext = await $._autoBuildChannelContext(channelName);

await channelContext.channel.ack(payload);
channelContext.channel.ack(payload);

const parsedPayload = Helpers.parsePayload(payload);
parsedPayload.metaData.headers.ackedAt = (new Date()).toISOString();
Expand Down Expand Up @@ -621,7 +621,7 @@ class BunnyBus extends EventEmitter {

channelContext.channel.sendToQueue(queue, payload.content, sendOptions);
await channelContext.channel.waitForConfirms();
await channelContext.channel.ack(payload);
channelContext.channel.ack(payload);

const parsedPayload = Helpers.parsePayload(payload);
parsedPayload.metaData.headers = Object.assign(parsedPayload.metaData.headers, headers);
Expand Down Expand Up @@ -652,7 +652,7 @@ class BunnyBus extends EventEmitter {
await $.createQueue(queue);
channelContext.channel.sendToQueue(queue, payload.content, sendOptions);
await channelContext.channel.waitForConfirms();
await channelContext.channel.ack(payload);
channelContext.channel.ack(payload);

const parsedPayload = Helpers.parsePayload(payload);
parsedPayload.metaData.headers = Object.assign(parsedPayload.metaData.headers, headers);
Expand Down
12 changes: 6 additions & 6 deletions test/BunnyBus/subscribe-unsubscribe/single-queue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ describe('BunnyBus', () => {
});

await instance.subscribe(baseQueueName, handlers, { validatePublisher: true });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand All @@ -355,7 +355,7 @@ describe('BunnyBus', () => {
};

await instance.subscribe(baseQueueName, handlers, { validatePublisher: false });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand Down Expand Up @@ -383,7 +383,7 @@ describe('BunnyBus', () => {
};

await instance.subscribe(baseQueueName, handlers, { validatePublisher: true, validateVersion: false });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand Down Expand Up @@ -419,7 +419,7 @@ describe('BunnyBus', () => {
});

await instance.subscribe(baseQueueName, handlers, { validatePublisher: true, validateVersion: true });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand Down Expand Up @@ -447,7 +447,7 @@ describe('BunnyBus', () => {
};

await instance.subscribe(baseQueueName, handlers, { validatePublisher });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand Down Expand Up @@ -477,7 +477,7 @@ describe('BunnyBus', () => {
};

await instance.subscribe(baseQueueName, handlers, { validateVersion });
await channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
channelContext.channel.publish(config.globalExchange, publishOptions.routeKey, Buffer.from(JSON.stringify(messageObject)), headers);
});
});

Expand Down
2 changes: 1 addition & 1 deletion test/assertions/assertSend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const assertSend = async (instance, channelContext, message, queueName, transact
expect(result.properties.headers.routeKey).to.be.equal(message.event);
}

await channelContext.channel.ack(result);
channelContext.channel.ack(result);
};

module.exports = assertSend;