cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

topics are deprecated

Browse Source
This commit is contained in:
Marek Kotewicz 2015-01-29 15:45:04 +01:00
parent e380462532
commit 600c9dd27d
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/ethereum.js vendored
View File

@ -541,7 +541,7 @@ var addFunctionsToContract = function (contract, desc, address) {
var addEventRelatedPropertiesToContract = function (contract, desc, address) { var addEventRelatedPropertiesToContract = function (contract, desc, address) {
contract.address = address; contract.address = address;
Object.defineProperty(contract, 'topics', { Object.defineProperty(contract, 'topic', {
get: function() { get: function() {
return abi.filterEvents(desc).map(function (e) { return abi.filterEvents(desc).map(function (e) {
return abi.methodSignature(e.name); return abi.methodSignature(e.name);
@ -565,7 +565,7 @@ var addEventsToContract = function (contract, desc, address) {
impl.address = address; impl.address = address;
Object.defineProperty(impl, 'topics', { Object.defineProperty(impl, 'topic', {
get: function() { get: function() {
return [abi.methodSignature(e.name)]; return [abi.methodSignature(e.name)];
} }
@ -706,10 +706,13 @@ var Filter = function(options, impl) {
if (typeof options !== "string") { if (typeof options !== "string") {
// evaluate lazy properties // evaluate lazy properties
if (options.topics) {
console.warn('"topics" is deprecated, use "topic" instead');
}
options = { options = {
to: options.to, to: options.to,
topic: options.topic, topic: options.topic,
topics: options.topics,
earliest: options.earliest, earliest: options.earliest,
latest: options.latest, latest: options.latest,
max: options.max, max: options.max,

6
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
lib/contract.js
View File

@ -110,7 +110,7 @@ var addFunctionsToContract = function (contract, desc, address) {
var addEventRelatedPropertiesToContract = function (contract, desc, address) { var addEventRelatedPropertiesToContract = function (contract, desc, address) {
contract.address = address; contract.address = address;
Object.defineProperty(contract, 'topics', { Object.defineProperty(contract, 'topic', {
get: function() { get: function() {
return abi.filterEvents(desc).map(function (e) { return abi.filterEvents(desc).map(function (e) {
return abi.methodSignature(e.name); return abi.methodSignature(e.name);
@ -134,7 +134,7 @@ var addEventsToContract = function (contract, desc, address) {
impl.address = address; impl.address = address;
Object.defineProperty(impl, 'topics', { Object.defineProperty(impl, 'topic', {
get: function() { get: function() {
return [abi.methodSignature(e.name)]; return [abi.methodSignature(e.name)];
} }

5
lib/filter.js
View File

@ -33,10 +33,13 @@ var Filter = function(options, impl) {
if (typeof options !== "string") { if (typeof options !== "string") {
// evaluate lazy properties // evaluate lazy properties
if (options.topics) {
console.warn('"topics" is deprecated, use "topic" instead');
}
options = { options = {
to: options.to, to: options.to,
topic: options.topic, topic: options.topic,
topics: options.topics,
earliest: options.earliest, earliest: options.earliest,
latest: options.latest, latest: options.latest,
max: options.max, max: options.max,