chore: rename address variables

nervosnetwork · Sep 18, 2019 · fb559ac · fb559ac
1 parent d2b7a98
commit fb559ac
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/lib/ckb/address.rb b/lib/ckb/address.rb
@@ -35,7 +35,7 @@ def generate
     # see https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0021-ckb-address-format/0021-ckb-address-format.md for more info.
     # @param [String] hash160
     # @return [String]
-    def generate_type11_address(hash160)
+    def generate_short_payload_hash160_address(hash160)
       hash160_bin = [hash160[2..-1]].pack("H*")
       type = [TYPES[0]].pack("H*")
       code_hash_index = [CODE_HASH_INDEXES[1]].pack("H*")

diff --git a/spec/ckb/address_spec.rb b/spec/ckb/address_spec.rb
@@ -9,12 +9,12 @@
   let(:data_hash) { "0xa656f172b6b45c245307aeb5a7a37a176f002f6f22e92582c58bf7ba362e4176" }
   let(:type_hash) { "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2" }
   let(:pubkey_hash160) { "0xc8045f588e627a8381810923c61d0705d10b86d3" }
-  let(:type10_address) { "ckt1qyqrdsefa43s6m882pcj53m4gdnj4k440axqswmu83" }
-  let(:type11_address) { "ckt1qyquspzltz8xy75rsxqsjg7xr5rst5gtsmfsjh777d" }
-  let(:type2_address) { "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhv9pkcv576ccddnn4quf2ga65xee2m26h7nq2rtnac" }
-  let(:type4_address) { "ckt1qsvf96jqmq4483ncl7yrzfzshwchu9jd0glq4yy5r2jcsw04d7xly9pkcv576ccddnn4quf2ga65xee2m26h7nqp5mnpu" }
-  let(:type2_address_with_multiple_args) { "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhv9xau7qpcpealv6xf3a37pdcq6ajhwuyaxg5q8qam7wpx5rpka34efg7wd0u9vpuaceescp87n" }
-  let(:type4_address_with_multiple_args) { "ckt1qsvf96jqmq4483ncl7yrzfzshwchu9jd0glq4yy5r2jcsw04d7xly9xau7qpcpealv6xf3a37pdcq6ajhwuyaxg5q8qam7wpx5rpka34efg7wd0u9vpuaceexvj7zq" }
+  let(:short_payload_blake160_address) { "ckt1qyqrdsefa43s6m882pcj53m4gdnj4k440axqswmu83" }
+  let(:short_payload_hash160_address) { "ckt1qyquspzltz8xy75rsxqsjg7xr5rst5gtsmfsjh777d" }
+  let(:full_payload_data_address) { "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhv9pkcv576ccddnn4quf2ga65xee2m26h7nq2rtnac" }
+  let(:full_payload_type_address) { "ckt1qsvf96jqmq4483ncl7yrzfzshwchu9jd0glq4yy5r2jcsw04d7xly9pkcv576ccddnn4quf2ga65xee2m26h7nqp5mnpu" }
+  let(:full_payload_data_address_with_multiple_args) { "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhv9xau7qpcpealv6xf3a37pdcq6ajhwuyaxg5q8qam7wpx5rpka34efg7wd0u9vpuaceescp87n" }
+  let(:full_payload_type_address_with_multiple_args) { "ckt1qsvf96jqmq4483ncl7yrzfzshwchu9jd0glq4yy5r2jcsw04d7xly9xau7qpcpealv6xf3a37pdcq6ajhwuyaxg5q8qam7wpx5rpka34efg7wd0u9vpuaceexvj7zq" }
   let(:multiple_args) { %w(0xdde7801c073dfb3464c7b1f05b806bb2bbb84e99 0x01c1ddf9c135061b7635ca51e735fc2b03cee339) }
 
   context "from pubkey" do
@@ -31,19 +31,19 @@
     it "generate type1 code_hash_index 0 address" do
       expect(
         addr.to_s
-      ).to eq type10_address
+      ).to eq short_payload_blake160_address
     end
 
     it "generate type1 code_hash_index 1 address" do
       expect(
-        addr.generate_type11_address(pubkey_hash160)
-      ).to eq type11_address
+        addr.generate_short_payload_hash160_address(pubkey_hash160)
+      ).to eq short_payload_hash160_address
     end
 
     it "generate type2 address" do
       expect(
         addr.generate_full_payload_address(2, data_hash, [pubkey_blake160])
-      ).to eq type2_address
+      ).to eq full_payload_data_address
     end
 
     it "generate type2 address should raise error when format_type is invalid" do
@@ -68,54 +68,54 @@
     it "generate type4 address" do
       expect(
         addr.generate_full_payload_address(4, type_hash, [pubkey_blake160])
-      ).to eq type4_address
+      ).to eq full_payload_type_address
     end
 
     it "generate type2 address with multiple args" do
       expect(
         addr.generate_full_payload_address(2, data_hash, multiple_args)
-      ).to eq type2_address_with_multiple_args
+      ).to eq full_payload_data_address_with_multiple_args
     end
 
     it "generate type4 address with multiple args" do
       expect(
         addr.generate_full_payload_address(4, type_hash, multiple_args)
-      ).to eq type4_address_with_multiple_args
+      ).to eq full_payload_type_address_with_multiple_args
     end
 
     it "parse type1 code_hash_index 0 address" do
       expect(
-        addr.parse(type10_address)
+        addr.parse(short_payload_blake160_address)
       ).to eq pubkey_blake160
     end
 
     it "parse type1 code_hash_index 1 address" do
       expect(
-        addr.parse_type11_address(type11_address)
+        addr.parse_type11_address(short_payload_hash160_address)
       ).to eq pubkey_hash160
     end
 
     it "parse type2 address" do
       expect(
-        addr.parse_full_payload_address(type2_address)
+        addr.parse_full_payload_address(full_payload_data_address)
       ).to eq ["02", data_hash, [pubkey_blake160]]
     end
 
     it "parse type4 address" do
       expect(
-        addr.parse_full_payload_address(type4_address)
+        addr.parse_full_payload_address(full_payload_type_address)
       ).to eq ["04", type_hash, [pubkey_blake160]]
     end
 
     it "parse type2 address with multiple args" do
       expect(
-        addr.parse_full_payload_address(type2_address_with_multiple_args)
+        addr.parse_full_payload_address(full_payload_data_address_with_multiple_args)
       ).to eq ["02", data_hash, multiple_args]
     end
 
     it "parse type4 address with multiple args" do
       expect(
-        addr.parse_full_payload_address(type4_address_with_multiple_args)
+        addr.parse_full_payload_address(full_payload_type_address_with_multiple_args)
       ).to eq ["04", type_hash, multiple_args]
     end
   end
@@ -126,93 +126,93 @@
     it "generate type1 code_hash_index 0 address" do
       expect(
         addr.to_s
-      ).to eq type10_address
+      ).to eq short_payload_blake160_address
     end
 
     it "generate type1 code_hash_index 1 address" do
       expect(
-        addr.generate_type11_address(pubkey_hash160)
-      ).to eq type11_address
+        addr.generate_short_payload_hash160_address(pubkey_hash160)
+      ).to eq short_payload_hash160_address
     end
 
     it "generate type2 address" do
       expect(
         addr.generate_full_payload_address("0x02", data_hash, [pubkey_blake160])
-      ).to eq type2_address
+      ).to eq full_payload_data_address
     end
 
     it "generate type4 address" do
       expect(
         addr.generate_full_payload_address("0x04", type_hash, [pubkey_blake160])
-      ).to eq type4_address
+      ).to eq full_payload_type_address
     end
 
     it "generate type2 address with multiple args" do
       expect(
         addr.generate_full_payload_address("0x02", data_hash, multiple_args)
-      ).to eq type2_address_with_multiple_args
+      ).to eq full_payload_data_address_with_multiple_args
     end
 
     it "generate type4 address with multiple args" do
       expect(
         addr.generate_full_payload_address("0x04", type_hash, multiple_args)
-      ).to eq type4_address_with_multiple_args
+      ).to eq full_payload_type_address_with_multiple_args
     end
 
     it "parse type1 code_hash_index 0 address" do
       expect(
-        addr.parse(type10_address)
+        addr.parse(short_payload_blake160_address)
       ).to eq pubkey_blake160
     end
 
     it "parse type1 code_hash_index 1 address" do
       expect(
-        addr.parse_type11_address(type11_address)
+        addr.parse_type11_address(short_payload_hash160_address)
       ).to eq pubkey_hash160
     end
 
     it "parse type2 address" do
       expect(
-        addr.parse_full_payload_address(type2_address)
+        addr.parse_full_payload_address(full_payload_data_address)
       ).to eq ["02", data_hash, [pubkey_blake160]]
     end
 
     it "parse type4 address" do
       expect(
-        addr.parse_full_payload_address(type4_address)
+        addr.parse_full_payload_address(full_payload_type_address)
       ).to eq ["04", type_hash, [pubkey_blake160]]
     end
 
     it "parse type2 address with multiple args" do
       expect(
-        addr.parse_full_payload_address(type2_address_with_multiple_args)
+        addr.parse_full_payload_address(full_payload_data_address_with_multiple_args)
       ).to eq ["02", data_hash, multiple_args]
     end
 
     it "parse type4 address with multiple args" do
       expect(
-        addr.parse_full_payload_address(type4_address_with_multiple_args)
+        addr.parse_full_payload_address(full_payload_type_address_with_multiple_args)
       ).to eq ["04", type_hash, multiple_args]
     end
   end
 
   context "self.parse" do
     it "parse type1 code_hash_index 0  address" do
       expect(
-        CKB::Address.parse(type10_address)
+        CKB::Address.parse(short_payload_blake160_address)
       ).to eq pubkey_blake160
     end
 
     it "failed if mainnet mode" do
       expect {
-        CKB::Address.parse(type10_address, mode: CKB::MODE::MAINNET)
+        CKB::Address.parse(short_payload_blake160_address, mode: CKB::MODE::MAINNET)
       }.to raise_error(RuntimeError)
     end
 
     it "eq to parse" do
       expect(
-        CKB::Address.parse(type10_address)
-      ).to eq CKB::Address.new(pubkey_blake160).parse(type10_address)
+        CKB::Address.parse(short_payload_blake160_address)
+      ).to eq CKB::Address.new(pubkey_blake160).parse(short_payload_blake160_address)
     end
   end
 end