diff --git a/lib/covenants/ownership.js b/lib/covenants/ownership.js index 466b0bbb..6defc4fc 100644 --- a/lib/covenants/ownership.js +++ b/lib/covenants/ownership.js @@ -258,9 +258,6 @@ class Ownership extends BNSOwnership { } } -Ownership.Proof = Proof; -Ownership.OwnershipProof = Proof; - /** * ProofData */ @@ -291,4 +288,9 @@ ownership = new Ownership(); * Expose */ -module.exports = ownership; +module.exports = Ownership; + +Ownership.Proof = Proof; +Ownership.OwnershipProof = Proof; +Ownership.ProofData = ProofData; +Ownership.ownership = ownership; diff --git a/lib/node/node.js b/lib/node/node.js index dea3d5ba..5cd6672b 100644 --- a/lib/node/node.js +++ b/lib/node/node.js @@ -14,7 +14,7 @@ const Config = require('bcfg'); const secp256k1 = require('bcrypto/lib/secp256k1'); const Network = require('../protocol/network'); const WorkerPool = require('../workers/workerpool'); -const ownership = require('../covenants/ownership'); +const {ownership} = require('../covenants/ownership'); /** * Node diff --git a/lib/node/rpc.js b/lib/node/rpc.js index d7f1bd11..10f75e1e 100644 --- a/lib/node/rpc.js +++ b/lib/node/rpc.js @@ -37,7 +37,7 @@ const pkg = require('../pkg'); const rules = require('../covenants/rules'); const {Resource} = require('../dns/resource'); const NameState = require('../covenants/namestate'); -const ownership = require('../covenants/ownership'); +const {ownership} = require('../covenants/ownership'); const AirdropProof = require('../primitives/airdropproof'); const {EXP} = consensus; const RPCBase = bweb.RPC; diff --git a/lib/primitives/claim.js b/lib/primitives/claim.js index 008efe6c..a1b7a1e1 100644 --- a/lib/primitives/claim.js +++ b/lib/primitives/claim.js @@ -12,13 +12,13 @@ const blake2b = require('bcrypto/lib/blake2b'); const consensus = require('../protocol/consensus'); const policy = require('../protocol/policy'); const rules = require('../covenants/rules'); -const ownership = require('../covenants/ownership'); +const Ownership = require('../covenants/ownership'); const InvItem = require('./invitem'); const TX = require('./tx'); const Input = require('./input'); const Output = require('./output'); const {types} = rules; -const {OwnershipProof} = ownership; +const {OwnershipProof} = Ownership; /* * Constants diff --git a/lib/wallet/wallet.js b/lib/wallet/wallet.js index b7f4b1f0..e8046d68 100644 --- a/lib/wallet/wallet.js +++ b/lib/wallet/wallet.js @@ -32,7 +32,7 @@ const rules = require('../covenants/rules'); const {Resource} = require('../dns/resource'); const Claim = require('../primitives/claim'); const reserved = require('../covenants/reserved'); -const ownership = require('../covenants/ownership'); +const {ownership} = require('../covenants/ownership'); const {states} = require('../covenants/namestate'); const {types} = rules; const {Mnemonic} = HD; diff --git a/lib/workers/master.js b/lib/workers/master.js index 8b5ecf61..0016ebb7 100644 --- a/lib/workers/master.js +++ b/lib/workers/master.js @@ -15,7 +15,7 @@ const Parser = require('./parser'); const Framer = require('./framer'); const packets = require('./packets'); const Parent = require('./parent'); -const ownership = require('../covenants/ownership'); +const {ownership} = require('../covenants/ownership'); /** * Master diff --git a/lib/workers/workerpool.js b/lib/workers/workerpool.js index adb31031..474a0602 100644 --- a/lib/workers/workerpool.js +++ b/lib/workers/workerpool.js @@ -17,7 +17,7 @@ const jobs = require('./jobs'); const Parser = require('./parser'); const Framer = require('./framer'); const packets = require('./packets'); -const ownership = require('../covenants/ownership'); +const {ownership} = require('../covenants/ownership'); /** * Worker Pool diff --git a/test/auction-reorg-test.js b/test/auction-reorg-test.js index 41446b53..42167d50 100644 --- a/test/auction-reorg-test.js +++ b/test/auction-reorg-test.js @@ -11,7 +11,7 @@ const Miner = require('../lib/mining/miner'); const MemWallet = require('./util/memwallet'); const Network = require('../lib/protocol/network'); const rules = require('../lib/covenants/rules'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const network = Network.get('regtest'); const {treeInterval} = network.names; diff --git a/test/auction-test.js b/test/auction-test.js index 41a3fe0a..9808214f 100644 --- a/test/auction-test.js +++ b/test/auction-test.js @@ -8,7 +8,7 @@ const Miner = require('../lib/mining/miner'); const MemWallet = require('./util/memwallet'); const Network = require('../lib/protocol/network'); const rules = require('../lib/covenants/rules'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const network = Network.get('regtest'); const GNAME_SIZE = 10; diff --git a/test/chain-checkpoints-test.js b/test/chain-checkpoints-test.js index d3dfb679..bff0639c 100644 --- a/test/chain-checkpoints-test.js +++ b/test/chain-checkpoints-test.js @@ -7,7 +7,7 @@ const Chain = require('../lib/blockchain/chain'); const BlockStore = require('../lib/blockstore/level'); const Miner = require('../lib/mining/miner'); const MemWallet = require('./util/memwallet'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const Address = require('../lib/primitives/address'); const Network = require('../lib/protocol/network'); const rules = require('../lib/covenants/rules'); diff --git a/test/claim-test.js b/test/claim-test.js index 4916379d..94249111 100644 --- a/test/claim-test.js +++ b/test/claim-test.js @@ -6,7 +6,7 @@ const Address = require('../lib/primitives/address'); const Claim = require('../lib/primitives/claim'); const FullNode = require('../lib/node/fullnode'); const consensus = require('../lib/protocol/consensus'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const reserved = require('../lib/covenants/reserved'); const {Resource} = require('../lib/dns/resource'); diff --git a/test/mempool-invalidation-test.js b/test/mempool-invalidation-test.js index eaafb312..69c6f0f4 100644 --- a/test/mempool-invalidation-test.js +++ b/test/mempool-invalidation-test.js @@ -4,7 +4,7 @@ const assert = require('bsert'); const {BufferMap} = require('buffer-map'); const Network = require('../lib/protocol/network'); const FullNode = require('../lib/node/fullnode'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const rules = require('../lib/covenants/rules'); const {forEvent} = require('./util/common'); diff --git a/test/mempool-test.js b/test/mempool-test.js index 82363a3c..a8a0d902 100644 --- a/test/mempool-test.js +++ b/test/mempool-test.js @@ -33,7 +33,7 @@ const rules = require('../lib/covenants/rules'); const {types} = rules; const NameState = require('../lib/covenants/namestate'); const {states} = NameState; -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const ONE_HASH = Buffer.alloc(32, 0x00); ONE_HASH[0] = 0x01; diff --git a/test/ownership-test.js b/test/ownership-test.js index b93abdde..7fcd3fa7 100644 --- a/test/ownership-test.js +++ b/test/ownership-test.js @@ -1,7 +1,7 @@ 'use strict'; const assert = require('bsert'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const Address = require('../lib/primitives/address'); const Network = require('../lib/protocol/network'); const network = Network.get('regtest'); diff --git a/test/txstart-test.js b/test/txstart-test.js index 7112c4ea..bc70a4c4 100644 --- a/test/txstart-test.js +++ b/test/txstart-test.js @@ -13,7 +13,7 @@ const Block = require('../lib/primitives/block'); const Address = require('../lib/primitives/address'); const Script = require('../lib/script/script'); const common = require('../lib/blockchain/common'); -const ownership = require('../lib/covenants/ownership'); +const {ownership} = require('../lib/covenants/ownership'); const VERIFY_NONE = common.flags.VERIFY_NONE; const node = new FullNode({ diff --git a/test/util/memwallet.js b/test/util/memwallet.js index 82c15d64..ff05f72f 100644 --- a/test/util/memwallet.js +++ b/test/util/memwallet.js @@ -25,11 +25,11 @@ const Claim = require('../../lib/primitives/claim'); const NameState = require('../../lib/covenants/namestate'); const NameUndo = require('../../lib/covenants/undo'); const reserved = require('../../lib/covenants/reserved'); -const ownership = require('../../lib/covenants/ownership'); +const Ownership = require('../../lib/covenants/ownership'); const policy = require('../../lib/protocol/policy'); const {Resource} = require('../../lib/dns/resource'); const Address = require('../../lib/primitives/address'); -const {OwnershipProof} = ownership; +const {OwnershipProof, ownership} = Ownership; const {states} = NameState; const {types} = rules;