topics are deprecated

pull/296/head
Marek Kotewicz 10 years ago
parent e380462532
commit 600c9dd27d
  1. 9
      dist/ethereum.js
  2. 6
      dist/ethereum.js.map
  3. 2
      dist/ethereum.min.js
  4. 4
      lib/contract.js
  5. 5
      lib/filter.js

9
dist/ethereum.js vendored

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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

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

Loading…
Cancel
Save