Skip to content

G
Geth-Modification
Commit 600c9dd2 authored by Marek Kotewicz's avatar Marek Kotewicz
Browse files
Options

topics are deprecated

parent e3804625
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 10 deletions
dist/ethereum.js
View file @ 600c9dd2
...@@ -541,7 +541,7 @@ var addFunctionsToContract = function (contract, desc, address) { ...@@ -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) { ...@@ -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) { ...@@ -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,
......
dist/ethereum.js.map
View file @ 600c9dd2
This diff is collapsed.
dist/ethereum.min.js
View file @ 600c9dd2
This diff is collapsed.
lib/contract.js
View file @ 600c9dd2
...@@ -110,7 +110,7 @@ var addFunctionsToContract = function (contract, desc, address) { ...@@ -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) { ...@@ -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)];
} }
......
lib/filter.js
View file @ 600c9dd2
...@@ -33,10 +33,13 @@ var Filter = function(options, impl) { ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment