aboutsummaryrefslogtreecommitdiffstats
path: root/lib/providermanager.js
diff options
context:
space:
mode:
Diffstat (limited to 'lib/providermanager.js')
-rw-r--r--lib/providermanager.js29
1 files changed, 10 insertions, 19 deletions
diff --git a/lib/providermanager.js b/lib/providermanager.js
index f79a9b087..c3b121451 100644
--- a/lib/providermanager.js
+++ b/lib/providermanager.js
@@ -56,21 +56,20 @@ var ProviderManager = function() {
};
/// sends outgoing requests, if provider is not available, enqueue the request
-ProviderManager.prototype.send = function(data, cb) {
- data._id = this.id;
- if (cb) {
- web3._callbacks[data._id] = cb;
- }
+ProviderManager.prototype.send = function(data) {
data.args = data.args || [];
- this.id++;
+ data._id = this.id++;
- if(this.provider !== undefined) {
- this.provider.send(data);
- } else {
- console.warn("provider is not set");
- this.queued.push(data);
+ if (this.provider === undefined) {
+ console.error('provider is not set');
+ return undefined;
}
+
+ //TODO: handle error here?
+ var result = this.provider.send(data);
+ result = JSON.parse(result);
+ return result.result;
};
/// setups provider, which will be used for sending messages
@@ -83,14 +82,6 @@ ProviderManager.prototype.set = function(provider) {
this.ready = true;
};
-/// resends queued messages
-ProviderManager.prototype.sendQueued = function() {
- for(var i = 0; this.queued.length; i++) {
- // Resend
- this.send(this.queued[i]);
- }
-};
-
/// @returns true if the provider i properly set
ProviderManager.prototype.installed = function() {
return this.provider !== undefined;